aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-10-25 04:29:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-25 12:36:59 -0400
commitacbf0e5263de563e25f7c104868e4490b9e72b13 (patch)
treeeea29d377e4e0985f02000d7dff95c7c187c820e /drivers/usb
parentea0dbebffe118724cd4df7d9b071ea8ee48d48f0 (diff)
USB: opticon: fix memory leak in error path
Fix memory leak in write error path. Cc: <stable@vger.kernel.org> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/opticon.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 459c28889fe4..6aba731d4864 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -286,7 +286,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,
286 if (!dr) { 286 if (!dr) {
287 dev_err(&port->dev, "out of memory\n"); 287 dev_err(&port->dev, "out of memory\n");
288 count = -ENOMEM; 288 count = -ENOMEM;
289 goto error; 289 goto error_no_dr;
290 } 290 }
291 291
292 dr->bRequestType = USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT; 292 dr->bRequestType = USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT;
@@ -316,6 +316,8 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,
316 316
317 return count; 317 return count;
318error: 318error:
319 kfree(dr);
320error_no_dr:
319 usb_free_urb(urb); 321 usb_free_urb(urb);
320error_no_urb: 322error_no_urb:
321 kfree(buffer); 323 kfree(buffer);