diff options
| author | Kishon Vijay Abraham I | 2012-07-09 08:34:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-07-09 18:46:51 +0200 |
| commit | 277bd8746bb8d23c00ff8343e58df783544e961e (patch) | |
| tree | 3cf7c6eca9acf00220ac4a0e9f3562069559b55c /drivers/usb | |
| parent | usb/hcd: Ensure scatter-gather is not used for isoc transfers (diff) | |
| download | kernel-qcow2-linux-277bd8746bb8d23c00ff8343e58df783544e961e.tar.gz kernel-qcow2-linux-277bd8746bb8d23c00ff8343e58df783544e961e.tar.xz kernel-qcow2-linux-277bd8746bb8d23c00ff8343e58df783544e961e.zip | |
drivers: usb: otg: fix build break in twl6030-usb.c
Fixed a mistake in the merge conflict resoultion commit(ff9cce) in file
twl6030-usb.c
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/otg/twl6030-usb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c index a3d0c0405cca..6907d8df7a27 100644 --- a/drivers/usb/otg/twl6030-usb.c +++ b/drivers/usb/otg/twl6030-usb.c @@ -302,8 +302,6 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl) twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR); twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET); status = OMAP_MUSB_ID_GROUND; - otg->default_a = true; - twl->phy.state = OTG_STATE_A_IDLE; twl->linkstat = status; omap_musb_mailbox(status); } else { |