X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fisdn%2Fsc%2Fioctl.c;fp=drivers%2Fisdn%2Fsc%2Fioctl.c;h=94c9afb7017c66791b1eb154bcdf5d53f350b77c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=57c4ab96d136465195f89e232e345ee5771e287b;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c
index 57c4ab96d..94c9afb70 100644
--- a/drivers/isdn/sc/ioctl.c
+++ b/drivers/isdn/sc/ioctl.c
@@ -46,8 +46,7 @@ int sc_ioctl(int card, scs_ioctl *data)
 		pr_debug("%s: SCIOCRESET: ioctl received\n",
 			sc_adapter[card]->devicename);
 		sc_adapter[card]->StartOnReset = 0;
-		kfree(rcvmsg);
-		return reset(card);
+		return (reset(card));
 	}
 
 	case SCIOCLOAD:
@@ -97,7 +96,6 @@ int sc_ioctl(int card, scs_ioctl *data)
 
 	case SCIOCSTART:
 	{
-		kfree(rcvmsg);
 		pr_debug("%s: SCIOSTART: ioctl received\n",
 				sc_adapter[card]->devicename);
 		if(sc_adapter[card]->EngineUp) {
@@ -185,7 +183,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;
 		}
@@ -197,10 +195,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;
 		}