lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: imx_udc: Fix IMX UDC gadget ep0 irq handling

Browse Source 
Fix ep0 interrupt handling in IMX UDC Gadget.

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Darius Augulis
2009-01-21 15:18:33 +02:00
committed by Greg Kroah-Hartman
parent 593bef6c75
commit d24921a36d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/gadget/imx_udc.c
View File

@@ -1133,6 +1133,7 @@ end_irq:
static irqreturn_t imx_udc_ctrl_irq(int irq, void *dev) static irqreturn_t imx_udc_ctrl_irq(int irq, void *dev)
{ {
struct imx_udc_struct *imx_usb = dev; struct imx_udc_struct *imx_usb = dev;
struct imx_ep_struct *imx_ep = &imx_usb->imx_ep[0];
int intr = __raw_readl(imx_usb->base + USB_EP_INTR(0)); int intr = __raw_readl(imx_usb->base + USB_EP_INTR(0));
dump_ep_intr(__func__, 0, intr, imx_usb->dev); dump_ep_intr(__func__, 0, intr, imx_usb->dev);
@@ -1142,16 +1143,15 @@ static irqreturn_t imx_udc_ctrl_irq(int irq, void *dev)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* DEVREQ IRQ has highest priority */ /* DEVREQ has highest priority */
if (intr & (EPINTR_DEVREQ | EPINTR_MDEVREQ)) if (intr & (EPINTR_DEVREQ | EPINTR_MDEVREQ))
handle_ep0_devreq(imx_usb); handle_ep0_devreq(imx_usb);
/* Seem i.MX is missing EOF interrupt sometimes. /* Seem i.MX is missing EOF interrupt sometimes.
* Therefore we monitor both EOF and FIFO_EMPTY interrups * Therefore we don't monitor EOF.
* when transmiting, and both EOF and FIFO_FULL when * We call handle_ep0() only if a request is queued for ep0.
* receiving data.
*/ */
else if (intr & (EPINTR_EOF | EPINTR_FIFO_EMPTY | EPINTR_FIFO_FULL)) else if (!list_empty(&imx_ep->queue))
handle_ep0(&imx_usb->imx_ep[0]); handle_ep0(imx_ep);
__raw_writel(intr, imx_usb->base + USB_EP_INTR(0)); __raw_writel(intr, imx_usb->base + USB_EP_INTR(0));