| commit | 5f1e8ce75c19b0433aba6e0ea28937f1ee5d849e | [log] [tgz] |
|---|---|---|
| author | Hema HK <hemahk@ti.com> | Thu Mar 17 16:11:58 2011 +0530 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Wed Mar 23 13:14:17 2011 -0700 |
| tree | 751c1e9307fab582eb842324e0199b4d1e5e0beb | |
| parent | b5a3b3d985493c173925907adfebf3edab236fe7 [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>