diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 13:19:10 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 13:19:10 +0400 |
| commit | 840ed42942cc1ebbda2ed55f4019673b537fc5de (patch) | |
| tree | 415644488e3966837eeb5061d96d4ca7db862318 /drivers/usb/gadget | |
| parent | 0dca30003bc752b2fc15906e562ef4e4925725fd (diff) | |
| parent | 0a9d5ac307aefbb2c772537d3fe7f75046d563ac (diff) | |
| download | linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.tar.xz | |
Merge branch 'next/hdmi-samsung' into next/devel-samsung
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/net2272.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c index 43ac7482fa91..c009263a47e3 100644 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@ -2069,8 +2069,10 @@ static irqreturn_t net2272_irq(int irq, void *_dev) #if defined(PLX_PCI_RDK2) /* see if PCI int for us by checking irqstat */ intcsr = readl(dev->rdk2.fpga_base_addr + RDK2_IRQSTAT); - if (!intcsr & (1 << NET2272_PCI_IRQ)) + if (!intcsr & (1 << NET2272_PCI_IRQ)) { + spin_unlock(&dev->lock); return IRQ_NONE; + } /* check dma interrupts */ #endif /* Platform/devcice interrupt handler */ |