From 80778175b87ea4adcd5ba1b782f02c21cf0ae7b2 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Mon, 24 Nov 2008 13:06:49 +0200 Subject: [PATCH] --- yaml --- r: 127249 b: refs/heads/master c: 71783e0defa16ca5abca7750df98ff8e7767bd2e h: refs/heads/master i: 127247: b68c2426f1ef78982149aa31a496506e50e306a1 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/omap2430.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 79c0a51f0dd2..01aea3223e24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58e660266d92aaa186c3df607c0ee88f18c8f4da +refs/heads/master: 71783e0defa16ca5abca7750df98ff8e7767bd2e diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c index 52988a403b5c..901dffdf23b1 100644 --- a/trunk/drivers/usb/musb/omap2430.c +++ b/trunk/drivers/usb/musb/omap2430.c @@ -58,10 +58,10 @@ static void musb_do_idle(unsigned long _musb) #endif u8 devctl; - devctl = musb_readb(musb->mregs, MUSB_DEVCTL); - spin_lock_irqsave(&musb->lock, flags); + devctl = musb_readb(musb->mregs, MUSB_DEVCTL); + switch (musb->xceiv.state) { case OTG_STATE_A_WAIT_BCON: devctl &= ~MUSB_DEVCTL_SESSION;