diff options
| author | Robert Baldyga <r.baldyga@samsung.com> | 2013-09-19 11:50:20 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-10-15 08:43:34 -0500 |
| commit | 7e8046505c9fda30c3c2a64f1cc84390e2458c54 (patch) | |
| tree | 3c815a6644e2cbd3f43d6572bd7e6936ec1db39c /drivers/usb/gadget/s3c-hsotg.c | |
| parent | afcf4169a41ef02d3f833f4eccac11038bd2b39c (diff) | |
| download | op-kernel-dev-7e8046505c9fda30c3c2a64f1cc84390e2458c54.zip op-kernel-dev-7e8046505c9fda30c3c2a64f1cc84390e2458c54.tar.gz | |
usb: gadget: s3c-hsotg: add DAINT masking
In OEPInt/IEPInt interrupts handling added bitwise and of DAINT and
DAINTMSK, because we should handle masked interrupts only.
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/s3c-hsotg.c')
| -rw-r--r-- | drivers/usb/gadget/s3c-hsotg.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 30cead1..8d71a9b 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -2433,10 +2433,14 @@ irq_retry: if (gintsts & (GINTSTS_OEPInt | GINTSTS_IEPInt)) { u32 daint = readl(hsotg->regs + DAINT); - u32 daint_out = daint >> DAINT_OutEP_SHIFT; - u32 daint_in = daint & ~(daint_out << DAINT_OutEP_SHIFT); + u32 daintmsk = readl(hsotg->regs + DAINTMSK); + u32 daint_out, daint_in; int ep; + daint &= daintmsk; + daint_out = daint >> DAINT_OutEP_SHIFT; + daint_in = daint & ~(daint_out << DAINT_OutEP_SHIFT); + dev_dbg(hsotg->dev, "%s: daint=%08x\n", __func__, daint); for (ep = 0; ep < 15 && daint_out; ep++, daint_out >>= 1) { |
