From 48e5ec6aceb8667ff822c5c7dd1eb2f97b11e9c9 Mon Sep 17 00:00:00 2001 From: Cliff Cai Date: Mon, 16 Nov 2009 16:19:26 +0530 Subject: [PATCH] --- yaml --- r: 174967 b: refs/heads/master c: 6bd03e7b9d0f70928f9cd793326c28e4e08ffc96 h: refs/heads/master i: 174965: e8344e9e5dd942efed36f2182204fdc652fcfc11 174963: cf03a3d5ab3e8e380d48fc1b7cb58c99a54c2729 174959: 813f1af40d4d25e60b6500ed993ab39d8d63565a v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musbhsdma.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8ead675ef1cc..024c40b3de2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2002e7684dc24a9ac245b7d015380918657ec032 +refs/heads/master: 6bd03e7b9d0f70928f9cd793326c28e4e08ffc96 diff --git a/trunk/drivers/usb/musb/musbhsdma.c b/trunk/drivers/usb/musb/musbhsdma.c index 5e83f96d6b77..c767387f507b 100644 --- a/trunk/drivers/usb/musb/musbhsdma.c +++ b/trunk/drivers/usb/musb/musbhsdma.c @@ -259,6 +259,11 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) if (!int_hsdma) goto done; +#ifdef CONFIG_BLACKFIN + /* Clear DMA interrupt flags */ + musb_writeb(mbase, MUSB_HSDMA_INTR, int_hsdma); +#endif + for (bchannel = 0; bchannel < MUSB_HSDMA_CHANNELS; bchannel++) { if (int_hsdma & (1 << bchannel)) { musb_channel = (struct musb_dma_channel *) @@ -324,11 +329,6 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) } } -#ifdef CONFIG_BLACKFIN - /* Clear DMA interrup flags */ - musb_writeb(mbase, MUSB_HSDMA_INTR, int_hsdma); -#endif - retval = IRQ_HANDLED; done: spin_unlock_irqrestore(&musb->lock, flags);