releases/3.16.3/mfd-omap-usb-host-fix-improper-mask-use.patch

   1 From 46de8ff8e80a6546aa3d2fdf58c6776666301a0c Mon Sep 17 00:00:00 2001
   2 From: Michael Welling <mwelling@emacinc.com>
   3 Date: Mon, 28 Jul 2014 18:01:04 -0500
   4 Subject: mfd: omap-usb-host: Fix improper mask use.
   5
   6 From: Michael Welling <mwelling@emacinc.com>
   7
   8 commit 46de8ff8e80a6546aa3d2fdf58c6776666301a0c upstream.
   9
  10 single-ulpi-bypass is a flag used for older OMAP3 silicon.
  11
  12 The flag when set, can excite code that improperly uses the
  13 OMAP_UHH_HOSTCONFIG_UPLI_BYPASS define to clear the corresponding bit.
  14 Instead it clears all of the other bits disabling all of the ports in
  15 the process.
  16
  17 Signed-off-by: Michael Welling <mwelling@emacinc.com>
  18 Signed-off-by: Lee Jones <lee.jones@linaro.org>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/mfd/omap-usb-host.c |    2 +-
  23  1 file changed, 1 insertion(+), 1 deletion(-)
  24
  25 --- a/drivers/mfd/omap-usb-host.c
  26 +++ b/drivers/mfd/omap-usb-host.c
  27 @@ -445,7 +445,7 @@ static unsigned omap_usbhs_rev1_hostconf
  28
  29                 for (i = 0; i < omap->nports; i++) {
  30                         if (is_ehci_phy_mode(pdata->port_mode[i])) {
  31 -                               reg &= OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
  32 +                               reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
  33                                 break;
  34                         }
  35                 }