mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (103 commits) usbcore: remove unused argument in autosuspend USB: keep count of unsuspended children USB hub: simplify remote-wakeup handling USB: struct usb_device: change flag to bitflag OHCI: make autostop conditional on CONFIG_PM USB: Add autosuspend support to the hub driver EHCI: Fix root-hub and port suspend/resume problems USB: create a new thread for every USB device found during the probe sequence USB: add driver for the USB debug devices USB: added dynamic major number for USB endpoints USB: pegasus error path not resetting task's state USB: endianness fix for asix.c USB: build the appledisplay driver USB serial: replace kmalloc+memset with kzalloc USB: hid-core: canonical defines for Apple USB device IDs USB: idmouse cleanup USB: make drivers/usb/core/driver.c:usb_device_match() static USB: lh7a40x_udc remove double declaration USB: pxa2xx_udc recognizes ixp425 rev b0 chip usbtouchscreen: add support for DMC TSC-10/25 devices ...
This commit is contained in:
commit
9641219825
98 changed files with 1264 additions and 851 deletions
|
|
@ -815,14 +815,11 @@ static int gigaset_probe(struct usb_interface *interface,
|
|||
return 0;
|
||||
|
||||
error:
|
||||
if (ucs->read_urb)
|
||||
usb_kill_urb(ucs->read_urb);
|
||||
usb_kill_urb(ucs->read_urb);
|
||||
kfree(ucs->bulk_out_buffer);
|
||||
if (ucs->bulk_out_urb != NULL)
|
||||
usb_free_urb(ucs->bulk_out_urb);
|
||||
usb_free_urb(ucs->bulk_out_urb);
|
||||
kfree(cs->inbuf[0].rcvbuf);
|
||||
if (ucs->read_urb != NULL)
|
||||
usb_free_urb(ucs->read_urb);
|
||||
usb_free_urb(ucs->read_urb);
|
||||
usb_set_intfdata(interface, NULL);
|
||||
ucs->read_urb = ucs->bulk_out_urb = NULL;
|
||||
cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
|
||||
|
|
@ -850,11 +847,9 @@ static void gigaset_disconnect(struct usb_interface *interface)
|
|||
usb_kill_urb(ucs->bulk_out_urb); /* FIXME: only if active? */
|
||||
|
||||
kfree(ucs->bulk_out_buffer);
|
||||
if (ucs->bulk_out_urb != NULL)
|
||||
usb_free_urb(ucs->bulk_out_urb);
|
||||
usb_free_urb(ucs->bulk_out_urb);
|
||||
kfree(cs->inbuf[0].rcvbuf);
|
||||
if (ucs->read_urb != NULL)
|
||||
usb_free_urb(ucs->read_urb);
|
||||
usb_free_urb(ucs->read_urb);
|
||||
ucs->read_urb = ucs->bulk_out_urb = NULL;
|
||||
cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue