summaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2013-10-02 11:22:33 +0200
committerIngo Molnar <mingo@kernel.org>2013-10-04 10:16:25 +0200
commit35a2af94c7ce7130ca292c68b1d27fcfdb648f6b (patch)
tree10b28670fb387984751de104913db9408ade8741 /net/irda
parentebdc195f2ec68576876216081035293e37318e86 (diff)
downloadlinux-35a2af94c7ce7130ca292c68b1d27fcfdb648f6b.tar.gz
linux-35a2af94c7ce7130ca292c68b1d27fcfdb648f6b.tar.bz2
linux-35a2af94c7ce7130ca292c68b1d27fcfdb648f6b.zip
sched/wait: Make the __wait_event*() interface more friendly
Change all __wait_event*() implementations to match the corresponding wait_event*() signature for convenience. In particular this does away with the weird 'ret' logic. Since there are __wait_event*() users this requires we update them too. Reviewed-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20131002092529.042563462@infradead.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/irda')
-rw-r--r--net/irda/af_irda.c5
1 files changed, 2 insertions, 3 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));