diff options
author | Cliff Cai <cliff.cai@analog.com> | 2009-11-16 05:49:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 14:55:24 -0500 |
commit | 6bd03e7b9d0f70928f9cd793326c28e4e08ffc96 (patch) | |
tree | 0ce38b2a5eb23bf1d7efd54494a9f617a1add84b /drivers | |
parent | 2002e7684dc24a9ac245b7d015380918657ec032 (diff) |
USB: musb: clear the Blackfin interrupt pending bits early in the ISR
If we clear the interrupt pending bits at the end, we sometimes return too
fast and have the same interrupt assert itself. There is no way in a
Blackfin system to force a sync of this state, so the hardware manual
instructs people to clear interrupt flags early in their ISR.
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/musb/musbhsdma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 5e83f96d6b77..c767387f507b 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c | |||
@@ -259,6 +259,11 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) | |||
259 | if (!int_hsdma) | 259 | if (!int_hsdma) |
260 | goto done; | 260 | goto done; |
261 | 261 | ||
262 | #ifdef CONFIG_BLACKFIN | ||
263 | /* Clear DMA interrupt flags */ | ||
264 | musb_writeb(mbase, MUSB_HSDMA_INTR, int_hsdma); | ||
265 | #endif | ||
266 | |||
262 | for (bchannel = 0; bchannel < MUSB_HSDMA_CHANNELS; bchannel++) { | 267 | for (bchannel = 0; bchannel < MUSB_HSDMA_CHANNELS; bchannel++) { |
263 | if (int_hsdma & (1 << bchannel)) { | 268 | if (int_hsdma & (1 << bchannel)) { |
264 | musb_channel = (struct musb_dma_channel *) | 269 | musb_channel = (struct musb_dma_channel *) |
@@ -324,11 +329,6 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) | |||
324 | } | 329 | } |
325 | } | 330 | } |
326 | 331 | ||
327 | #ifdef CONFIG_BLACKFIN | ||
328 | /* Clear DMA interrup flags */ | ||
329 | musb_writeb(mbase, MUSB_HSDMA_INTR, int_hsdma); | ||
330 | #endif | ||
331 | |||
332 | retval = IRQ_HANDLED; | 332 | retval = IRQ_HANDLED; |
333 | done: | 333 | done: |
334 | spin_unlock_irqrestore(&musb->lock, flags); | 334 | spin_unlock_irqrestore(&musb->lock, flags); |