projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b5a3b3d) | patch
usb: musb: Fix for merge issue
authorHema HK <hemahk@ti.com>
Thu, 17 Mar 2011 10:41:58 +0000 (16:11 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Mar 2011 20:14:17 +0000 (13:14 -0700)
commit5f1e8ce75c19b0433aba6e0ea28937f1ee5d849e
tree751c1e9307fab582eb842324e0199b4d1e5e0bebtree | snapshot
parentb5a3b3d985493c173925907adfebf3edab236fe7commit | diff
usb: musb: Fix for merge issue

There was conflict while merging 2 patches. Enabling vbus code
is wrongly moved to error check if loop.

This is a fix to resolve the merge issue.

Signed-off-by: Hema HK <hemahk@ti.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/musb/musb_gadget.c diff | blob | history
Domain: System / Kernel;