Merge remote-tracking branch 'mvebu/for-next'

[karo-tx-linux.git] / net / irda / af_irda.c

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index fae6822cc367631ca403cc6207f800cf2571dfea..e6aa48b5395c67e2600eed9482c97b9a626d01bd 100644 (file)
--- 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;