From: Nishanth Aravamudan Subject: [KJ] [PATCH 20/34] isdn/capi: replace interruptible_sleep_on() with wait_event_interruptible() Use wait_event_interruptible() instead of the deprecated interruptible_sleep_on(). Patch is straight-forward as current sleep is conditionally looped. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- capi.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) Index: quilt/drivers/isdn/capi/capi.c =================================================================== --- quilt.orig/drivers/isdn/capi/capi.c +++ quilt/drivers/isdn/capi/capi.c @@ -675,13 +675,8 @@ capi_read(struct file *file, char __user if (file->f_flags & O_NONBLOCK) return -EAGAIN; - for (;;) { - interruptible_sleep_on(&cdev->recvwait); - if ((skb = skb_dequeue(&cdev->recvqueue)) != 0) - break; - if (signal_pending(current)) - break; - } + wait_event_interruptible(cdev->recvwait, + ((skb = skb_dequeue(&cdev->recvqueue)) == 0)); if (skb == 0) return -ERESTARTNOHAND; }