From 6688dee4335c39aab659e7cec3046c6a1d3573e5 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Fri, 31 Mar 2006 02:30:57 -0800
Subject: [PATCH] --- yaml --- r: 24899 b: refs/heads/master c:
 d32af0fe11b1618572389723e93cf33a4cc11c81 h: refs/heads/master i:   24897:
 62b4bdf3fae61c440971990b34d81ff0a088e942   24895:
 aed9b2c133fda3b9cd3e687859a1d77cfe873563 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/isdn/sc/ioctl.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d29942a16dfd..c3a3e04adda9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0b4ed728cdd0c7204392b0c18857e4a99917aa5
+refs/heads/master: d32af0fe11b1618572389723e93cf33a4cc11c81
diff --git a/trunk/drivers/isdn/sc/ioctl.c b/trunk/drivers/isdn/sc/ioctl.c
index 94c9afb7017c..f4f71226a078 100644
--- a/trunk/drivers/isdn/sc/ioctl.c
+++ b/trunk/drivers/isdn/sc/ioctl.c
@@ -46,7 +46,8 @@ int sc_ioctl(int card, scs_ioctl *data)
 		pr_debug("%s: SCIOCRESET: ioctl received\n",
 			sc_adapter[card]->devicename);
 		sc_adapter[card]->StartOnReset = 0;
-		return (reset(card));
+		kfree(rcvmsg);
+		return reset(card);
 	}
 
 	case SCIOCLOAD:
@@ -183,7 +184,7 @@ int sc_ioctl(int card, scs_ioctl *data)
 				sc_adapter[card]->devicename);
 
 		spid = kmalloc(SCIOC_SPIDSIZE, GFP_KERNEL);
-		if(!spid) {
+		if (!spid) {
 			kfree(rcvmsg);
 			return -ENOMEM;
 		}
@@ -195,10 +196,10 @@ int sc_ioctl(int card, scs_ioctl *data)
 		if (!status) {
 			pr_debug("%s: SCIOCGETSPID: command successful\n",
 					sc_adapter[card]->devicename);
-		}
-		else {
+		} else {
 			pr_debug("%s: SCIOCGETSPID: command failed (status = %d)\n",
 				sc_adapter[card]->devicename, status);
+			kfree(spid);
 			kfree(rcvmsg);
 			return status;
 		}