aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-10-25 13:35:09 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-10-30 23:27:03 +0000
commit61824fc04763ad0de619df9d1c2bf441b2f57123 (patch)
treec6133c15a98008d02d17471b4254225ff5260ee1 /drivers/usb/serial
parent87df704c0761f76644e3b4cc689805cfe60f874c (diff)
downloadkernel_samsung_smdk4412-61824fc04763ad0de619df9d1c2bf441b2f57123.zip
kernel_samsung_smdk4412-61824fc04763ad0de619df9d1c2bf441b2f57123.tar.gz
kernel_samsung_smdk4412-61824fc04763ad0de619df9d1c2bf441b2f57123.tar.bz2
USB: mos7840: fix urb leak at release
commit 65a4cdbb170e4ec1a7fa0e94936d47e24a17b0e8 upstream. Make sure control urb is freed at release. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/mos7840.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index b150ed9..e0667a9 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2661,6 +2661,7 @@ static void mos7840_release(struct usb_serial *serial)
mos7840_port = mos7840_get_port_private(serial->port[i]);
dbg("mos7840_port %d = %p", i, mos7840_port);
if (mos7840_port) {
+ usb_free_urb(mos7840_port->control_urb);
kfree(mos7840_port->ctrl_buf);
kfree(mos7840_port->dr);
kfree(mos7840_port);