[PATCH 1/2] ARM: OMAP: MUSB: dont exit with spinlock held

[Kevin Hilman <khilman@mvista.com>]

[-- Attachment #1: musb-locking-vbus-store.patch --]
[-- Type: text/plain, Size: 974 bytes --]

Signed-off-by: Kevin Hilman <khilman@mvista.com>

---
 drivers/usb/musb/musb_core.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: dev/drivers/usb/musb/musb_core.c
===================================================================
--- dev.orig/drivers/usb/musb/musb_core.c
+++ dev/drivers/usb/musb/musb_core.c
@@ -1682,19 +1682,22 @@ musb_vbus_store(struct device *dev, stru
 	struct musb	*musb = dev_to_musb(dev);
 	unsigned long	flags;
 	unsigned long	val;
+	ssize_t retval = n;
 
 	spin_lock_irqsave(&musb->lock, flags);
 	if (sscanf(buf, "%lu", &val) < 1) {
 		printk(KERN_ERR "Invalid VBUS timeout ms value\n");
-		return -EINVAL;
+		retval = -EINVAL;
+		goto out;
 	}
 	musb->a_wait_bcon = val;
 	if (musb->xceiv.state == OTG_STATE_A_WAIT_BCON)
 		musb->is_active = 0;
 	musb_platform_try_idle(musb, jiffies + msecs_to_jiffies(val));
+out:
 	spin_unlock_irqrestore(&musb->lock, flags);
 
-	return n;
+	return retval;
 }
 
 static ssize_t

--