]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: use usb_serial_put in usb_serial_probe errors
authorJan Safrata <jan.nikitenko@gmail.com>
Tue, 22 May 2012 12:04:50 +0000 (14:04 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 6 Dec 2012 11:20:13 +0000 (11:20 +0000)
commit 0658a3366db7e27fa32c12e886230bb58c414c92 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/usb/serial/usb-serial.c

index 8bea45c204b828f1ee407da878915198d051400d..e5206de3c31b14bccc5778a0f337faae253241ba 100644 (file)
@@ -764,7 +764,7 @@ 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;
                }
@@ -836,7 +836,7 @@ 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;
                }
@@ -850,7 +850,7 @@ 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;
                }