Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d32af0fe authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] ISDN: fix a few memory leaks in sc_ioctl() 



Fix a few memory leaks in drivers/isdn/sc/ioctl.c::sc_ioctl()

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b0b4ed72

drivers/isdn/sc/ioctl.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -46,7 +46,8 @@ int sc_ioctl(int card, scs_ioctl *data) 
		pr_debug("%s: SCIOCRESET: ioctl received\n",

		pr_debug("%s: SCIOCRESET: ioctl received\n",

			sc_adapter[card]->devicename);

			sc_adapter[card]->devicename);

		sc_adapter[card]->StartOnReset = 0;

		sc_adapter[card]->StartOnReset = 0;

		return (reset(card));

		kfree(rcvmsg);

		return reset(card);

	}

	}





	case SCIOCLOAD:

	case SCIOCLOAD:
@@ -195,10 +196,10 @@ int sc_ioctl(int card, scs_ioctl *data) 
		if (!status) {

		if (!status) {

			pr_debug("%s: SCIOCGETSPID: command successful\n",

			pr_debug("%s: SCIOCGETSPID: command successful\n",

					sc_adapter[card]->devicename);

					sc_adapter[card]->devicename);

		}

		} else {

		else {

			pr_debug("%s: SCIOCGETSPID: command failed (status = %d)\n",

			pr_debug("%s: SCIOCGETSPID: command failed (status = %d)\n",

				sc_adapter[card]->devicename, status);

				sc_adapter[card]->devicename, status);

			kfree(spid);

			kfree(rcvmsg);

			kfree(rcvmsg);

			return status;

			return status;

		}

		}