aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-11-03 18:18:37 +0100
committerDavid S. Miller <davem@davemloft.net>2015-11-03 13:30:47 -0500
commit37b8e1ca0fd7adce1c75b5d95e5515bd2dc234dd (patch)
tree6a62af36f0f69af03a61a82c6e0f26bd87bc8abc
parentMerge tag 'mac80211-for-davem-2015-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (diff)
downloadlinux-dev-37b8e1ca0fd7adce1c75b5d95e5515bd2dc234dd.tar.xz
linux-dev-37b8e1ca0fd7adce1c75b5d95e5515bd2dc234dd.zip
irda: Delete an unnecessary check before the function call "irlmp_unregister_service"
The irlmp_unregister_service() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/irda/af_irda.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index fae6822cc367..e6aa48b5395c 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2123,8 +2123,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
}
/* Unregister any old registration */
- if (self->skey)
- irlmp_unregister_service(self->skey);
+ irlmp_unregister_service(self->skey);
self->skey = irlmp_register_service((__u16) opt);
break;