From 5f1e8ce75c19b0433aba6e0ea28937f1ee5d849e Mon Sep 17 00:00:00 2001 From: Hema HK Date: Thu, 17 Mar 2011 16:11:58 +0530 Subject: [PATCH] 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 Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- Reading git-format-patch failed