USB: usb_wwan: remove redundant urb kill from port remove
authorJohan Hovold <jhovold@gmail.com>
Mon, 26 May 2014 17:23:23 +0000 (19:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 May 2014 22:04:07 +0000 (15:04 -0700)
Remove redundant usb_kill_urb from port remove, which is called
post-shutdown (close).

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/usb_wwan.c

index aa45985..c4a815c 100644 (file)
@@ -546,20 +546,17 @@ int usb_wwan_port_remove(struct usb_serial_port *port)
        portdata = usb_get_serial_port_data(port);
        usb_set_serial_port_data(port, NULL);
 
-       /* Stop reading/writing urbs and free them */
        for (i = 0; i < N_IN_URB; i++) {
-               usb_kill_urb(portdata->in_urbs[i]);
                usb_free_urb(portdata->in_urbs[i]);
                free_page((unsigned long)portdata->in_buffer[i]);
        }
        for (i = 0; i < N_OUT_URB; i++) {
-               usb_kill_urb(portdata->out_urbs[i]);
                usb_free_urb(portdata->out_urbs[i]);
                kfree(portdata->out_buffer[i]);
        }
 
-       /* Now free port private data */
        kfree(portdata);
+
        return 0;
 }
 EXPORT_SYMBOL(usb_wwan_port_remove);