From d4f0eecedbcc219512bb7a0b899e15723c68ee8d Mon Sep 17 00:00:00 2001
From: Karsten Keil <keil@b1-systems.de>
Date: Fri, 22 May 2009 11:04:52 +0000
Subject: [PATCH] --- yaml --- r: 150474 b: refs/heads/master c:
 5df3b8bcc7826b85a2d233dd20da3ed247e1dc1d h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/isdn/mISDN/socket.c | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 06d9ddfb3527..6dd41ab8519e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d796509a57777bc0f8f336e360695fad665c59f5
+refs/heads/master: 5df3b8bcc7826b85a2d233dd20da3ed247e1dc1d
diff --git a/trunk/drivers/isdn/mISDN/socket.c b/trunk/drivers/isdn/mISDN/socket.c
index 530f68977361..2a2c30a9438f 100644
--- a/trunk/drivers/isdn/mISDN/socket.c
+++ b/trunk/drivers/isdn/mISDN/socket.c
@@ -209,7 +209,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 
 	if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
 		err = -EFAULT;
-		goto drop;
+		goto done;
 	}
 
 	memcpy(mISDN_HEAD_P(skb), skb->data, MISDN_HEADER_LEN);
@@ -230,19 +230,21 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 		     __func__, mISDN_HEAD_ID(skb));
 
 	err = -ENODEV;
-	if (!_pms(sk)->ch.peer ||
-	    (err = _pms(sk)->ch.recv(_pms(sk)->ch.peer, skb)))
-		goto drop;
-
-	err = len;
+	if (!_pms(sk)->ch.peer)
+		goto done;
+	err = _pms(sk)->ch.recv(_pms(sk)->ch.peer, skb);
+	if (err)
+		goto done;
+	else {
+		skb = NULL;
+		err = len;
+	}
 
 done:
+	if (skb)
+		kfree_skb(skb);
 	release_sock(sk);
 	return err;
-
-drop:
-	kfree_skb(skb);
-	goto done;
 }
 
 static int