diff options
| author | Michael Welling <mwelling@emacinc.com> | 2014-07-28 18:01:04 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-17 09:03:57 -0700 |
| commit | 2c34d0d0fe11694fa617f7fca64d7e7fed59b3ea (patch) | |
| tree | 1f172b02c632b2940ef34db1b881bdd0291e6e02 | |
| parent | a8fd51944ec90a41b37afe0aee25cf9ec17be8fe (diff) | |
| download | lwn-2c34d0d0fe11694fa617f7fca64d7e7fed59b3ea.tar.gz lwn-2c34d0d0fe11694fa617f7fca64d7e7fed59b3ea.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 759fae3ca7fb..a36f3f282ae7 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; } } |