Skip to content

Commit

Permalink
usb: use usb_serial_put in usb_serial_probe errors
Browse files Browse the repository at this point in the history
The use of kfree(serial) in error cases of usb_serial_probe
was invalid - usb_serial structure allocated in create_serial()
gets reference of usb_device that needs to be put, so we need
to use usb_serial_put() instead of simple kfree().

Signed-off-by: Jan Safrata <jan.nikitenko@gmail.com>
Acked-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jan Safrata authored and Greg Kroah-Hartman committed Jun 14, 2012
1 parent 07828b1 commit 0658a33
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ static int usb_serial_probe(struct usb_interface *interface,

if (retval) {
dbg("sub driver rejected device");
kfree(serial);
usb_serial_put(serial);
module_put(type->driver.owner);
return retval;
}
Expand Down Expand Up @@ -829,7 +829,7 @@ static int usb_serial_probe(struct usb_interface *interface,
*/
if (num_bulk_in == 0 || num_bulk_out == 0) {
dev_info(&interface->dev, "PL-2303 hack: descriptors matched but endpoints did not\n");
kfree(serial);
usb_serial_put(serial);
module_put(type->driver.owner);
return -ENODEV;
}
Expand All @@ -843,7 +843,7 @@ static int usb_serial_probe(struct usb_interface *interface,
if (num_ports == 0) {
dev_err(&interface->dev,
"Generic device with no bulk out, not allowed.\n");
kfree(serial);
usb_serial_put(serial);
module_put(type->driver.owner);
return -EIO;
}
Expand Down

0 comments on commit 0658a33

Please sign in to comment.