Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 277bd874 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Greg Kroah-Hartman
Browse files

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: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe2072cc

drivers/usb/otg/twl6030-usb.c

+0 −2
Original line number Diff line number Diff line
@@ -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  {