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

Commit 2e52ec23 authored by Kirill Esipov's avatar Kirill Esipov Committed by Greg Kroah-Hartman
Browse files

usb: musb: remove duplicated actions 



Removing unnecessary duplicated actions that we've got while merging:
Commit 19915e62 ("Merge 4.1-rc7 into usb-next")

[ b-liu@ti.com: added 'Commit' in the commit message ]

Signed-off-by: default avatarKirill Esipov <yesipov@gmail.com>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 355f1a39

drivers/usb/musb/musb_core.c

+0 −5
Original line number Diff line number Diff line
@@ -2114,11 +2114,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
		musb->io.ep_offset = musb_flat_ep_offset;

		musb->io.ep_select = musb_flat_ep_select;

	}

	/* And override them with platform specific ops if specified. */

	if (musb->ops->ep_offset)

		musb->io.ep_offset = musb->ops->ep_offset;

	if (musb->ops->ep_select)

		musb->io.ep_select = musb->ops->ep_select;



	/* At least tusb6010 has its own offsets */

	if (musb->ops->ep_offset)