diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 20:41:19 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 20:41:19 +0200 |
| commit | 4af6600fd793023c01634cca5abfe4a2b707788f (patch) | |
| tree | 9e3a830d7782512b492011932ddd789d13a900c4 /drivers/usb/gadget/udc/net2280.c | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: i8042 - disable active multiplexing by default (diff) | |
| download | linux-4af6600fd793023c01634cca5abfe4a2b707788f.tar.xz linux-4af6600fd793023c01634cca5abfe4a2b707788f.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.18.
Diffstat (limited to 'drivers/usb/gadget/udc/net2280.c')
| -rw-r--r-- | drivers/usb/gadget/udc/net2280.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c index f4eac113690e..2e95715b50c0 100644 --- a/drivers/usb/gadget/udc/net2280.c +++ b/drivers/usb/gadget/udc/net2280.c @@ -3320,7 +3320,7 @@ static void handle_stat1_irqs(struct net2280 *dev, u32 stat) if (stat & tmp) { writel(tmp, &dev->regs->irqstat1); if ((((stat & BIT(ROOT_PORT_RESET_INTERRUPT)) && - (readl(&dev->usb->usbstat) & mask)) || + ((readl(&dev->usb->usbstat) & mask) == 0)) || ((readl(&dev->usb->usbctl) & BIT(VBUS_PIN)) == 0)) && (dev->gadget.speed != USB_SPEED_UNKNOWN)) { |