diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2008-11-24 13:06:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-07 09:59:59 -0800 |
| commit | 71783e0defa16ca5abca7750df98ff8e7767bd2e (patch) | |
| tree | 3e4180012869e613bea9a6175bd8423287218604 /drivers/usb | |
| parent | 58e660266d92aaa186c3df607c0ee88f18c8f4da (diff) | |
| download | kernel-crypto-71783e0defa16ca5abca7750df98ff8e7767bd2e.tar.gz kernel-crypto-71783e0defa16ca5abca7750df98ff8e7767bd2e.tar.xz kernel-crypto-71783e0defa16ca5abca7750df98ff8e7767bd2e.zip | |
USB: musb: minor locking fix
Minor locking fix for musb_hdrc on OMAP3 and OMAP2430:
don't read DEVCTL without holding the spinlock, since
an IRQ could come in and corrupt things.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 52988a403b5..901dffdf23b 100644 --- a/drivers/usb/musb/omap2430.c +++ b/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; |