summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Welling <mwelling@emacinc.com>2014-07-28 18:01:04 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:19:09 -0700
commiteec08eecb892a47fba01fc1762d299e84ba98224 (patch)
tree2e3527989db6fd156420084af3dbac2c75023dce
parent7ca5cd1e33333809622d07f34dccd39ceba10e4a (diff)
mfd: omap-usb-host: Fix improper mask use.
commit 46de8ff8e80a6546aa3d2fdf58c6776666301a0c upstream. single-ulpi-bypass is a flag used for older OMAP3 silicon. The flag when set, can excite code that improperly uses the OMAP_UHH_HOSTCONFIG_UPLI_BYPASS define to clear the corresponding bit. Instead it clears all of the other bits disabling all of the ports in the process. Signed-off-by: Michael Welling <mwelling@emacinc.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mfd/omap-usb-host.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 90b630ccc8bc..0aefe501fd3c 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -445,7 +445,7 @@ static unsigned omap_usbhs_rev1_hostconfig(struct usbhs_hcd_omap *omap,
for (i = 0; i < omap->nports; i++) {
if (is_ehci_phy_mode(pdata->port_mode[i])) {
- reg &= OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
+ reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
break;
}
}