xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 2.6.39-rc7 into usb-linus

Browse Source 
This was needed to resolve a conflict in:
	drivers/usb/host/isp1760-hcd.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2011-05-10 13:30:45 -07:00
parent 04aebcbb1b 693d92a1bb
commit 8a1629c771
559 changed files with 6289 additions and 3272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/musb/musb_gadget.c
View File

@@ -1888,11 +1888,9 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
otg_set_vbus(musb->xceiv, 1);
hcd->self.uses_pio_for_control = 1;
if (musb->xceiv->last_event == USB_EVENT_NONE)
pm_runtime_put(musb->controller);
}
if (musb->xceiv->last_event == USB_EVENT_NONE)
pm_runtime_put(musb->controller);
return 0;