From 3fbb8828ade74c7862d5ee9ea3fa9cc6fbb2c79b Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@web.de>
Date: Mon, 8 Feb 2010 10:12:21 +0000
Subject: [PATCH] --- yaml --- r: 184224 b: refs/heads/master c:
 28a1dbb6f7feade304f43798feb15f6978516624 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/isdn/capi/capi.c | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 58e3becf0298..0e77ea156159 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54f0fad3d8414cf770c1cf25a1d98fcaec899b5a
+refs/heads/master: 28a1dbb6f7feade304f43798feb15f6978516624
diff --git a/trunk/drivers/isdn/capi/capi.c b/trunk/drivers/isdn/capi/capi.c
index f8f86602c57e..8abec9655e1a 100644
--- a/trunk/drivers/isdn/capi/capi.c
+++ b/trunk/drivers/isdn/capi/capi.c
@@ -657,24 +657,19 @@ capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 	struct capidev *cdev = (struct capidev *)file->private_data;
 	struct sk_buff *skb;
 	size_t copied;
+	int err;
 
 	if (!cdev->ap.applid)
 		return -ENODEV;
 
-	if ((skb = skb_dequeue(&cdev->recvqueue)) == NULL) {
-
+	skb = skb_dequeue(&cdev->recvqueue);
+	if (!skb) {
 		if (file->f_flags & O_NONBLOCK)
 			return -EAGAIN;
-
-		for (;;) {
-			interruptible_sleep_on(&cdev->recvwait);
-			if ((skb = skb_dequeue(&cdev->recvqueue)) != NULL)
-				break;
-			if (signal_pending(current))
-				break;
-		}
-		if (skb == NULL)
-			return -ERESTARTNOHAND;
+		err = wait_event_interruptible(cdev->recvwait,
+				(skb = skb_dequeue(&cdev->recvqueue)));
+		if (err)
+			return err;
 	}
 	if (skb->len > count) {
 		skb_queue_head(&cdev->recvqueue, skb);