2 files changed, 4 insertions, 8 deletions

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 0578d4fa00a9..0f676908d15b 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2563,9 +2563,8 @@ bed:
                                   jiffies + msecs_to_jiffies(val));
 
                         /* Wait for IR-LMP to call us back */
-                        __wait_event_interruptible(self->query_wait,
-                              (self->cachedaddr != 0 || self->errno == -ETIME),
-                                                   err);
+                        err = __wait_event_interruptible(self->query_wait,
+                              (self->cachedaddr != 0 || self->errno == -ETIME));
 
                         /* If watchdog is still activated, kill it! */
                         del_timer(&(self->watchdog));
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index f4484719f3e6..f63c2388f38d 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1637,12 +1637,9 @@ static int sync_thread_master(void *data)
                         continue;
                 }
                 while (ip_vs_send_sync_msg(tinfo->sock, sb->mesg) < 0) {
-                        int ret = 0;
-
-                        __wait_event_interruptible(*sk_sleep(sk),
+                        int ret = __wait_event_interruptible(*sk_sleep(sk),
                                                    sock_writeable(sk) ||
-                                                   kthread_should_stop(),
-                                                   ret);
+                                                   kthread_should_stop());
                         if (unlikely(kthread_should_stop()))
                                 goto done;
                 }