diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
| commit | d831fd1b46d04e5c8c8a0431c321578d25852695 (patch) | |
| tree | 53a685712d0f0debe66de80c1f0a5e545d0de7e2 /drivers/mfd/omap-usb-host.c | |
| parent | c95c4e2a6bb8d44f9a8f59eadd99a9a615c53112 (diff) | |
| parent | 339f8f37f0203884332585e38c06536c8477d475 (diff) | |
Merge tag 'v3.10.55' into linux-linaro-lsklsk-v3.10-14.09
This is the 3.10.55 stable release
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 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; } } |