From: Kevin Hilman <khilman@mvista.com>
Date: Fri, 31 Aug 2007 23:29:22 +0000 (-0700)
Subject: ARM: OMAP: musb_vbus_store(): dont exit with spinlock held
X-Git-Tag: v2.6.23-omap1~65
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=ff0c4ff0b68d9f0e992ccd246f36ee2d4d2b338f

ARM: OMAP: musb_vbus_store(): dont exit with spinlock held

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 8a60ac56a37..9a73de521a8 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1712,11 +1712,12 @@ musb_vbus_store(struct device *dev, struct device_attribute *attr,
 	unsigned long	flags;
 	unsigned long	val;
 
-	spin_lock_irqsave(&musb->lock, flags);
 	if (sscanf(buf, "%lu", &val) < 1) {
 		printk(KERN_ERR "Invalid VBUS timeout ms value\n");
 		return -EINVAL;
 	}
+
+	spin_lock_irqsave(&musb->lock, flags);
 	musb->a_wait_bcon = val;
 	if (musb->xceiv.state == OTG_STATE_A_WAIT_BCON)
 		musb->is_active = 0;