diff options
| author | Michael Welling <mwelling@emacinc.com> | 2014-07-29 01:01:04 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-07-29 17:08:49 +0200 |
| commit | 46de8ff8e80a6546aa3d2fdf58c6776666301a0c (patch) | |
| tree | dcc6d751c6507b62190436c2415766d098d6f493 /drivers/mfd/omap-usb-host.c | |
| parent | mfd: arizona: Only free the CTRLIF_ERR IRQ if we requested it (diff) | |
| download | linux-46de8ff8e80a6546aa3d2fdf58c6776666301a0c.tar.xz linux-46de8ff8e80a6546aa3d2fdf58c6776666301a0c.zip | |
mfd: omap-usb-host: Fix improper mask use.
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.
Cc: stable@vger.kernel.org
Signed-off-by: Michael Welling <mwelling@emacinc.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/omap-usb-host.c')
| -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 b48d80c367f9..33a9234b701c 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; } } |