diff mbox

mfd: omap-usb-host: Fix improper mask use

Message ID 20140729083325.GA9030@lee--X1
State Accepted
Commit 46de8ff8e80a6546aa3d2fdf58c6776666301a0c
Headers show

Commit Message

Lee Jones July 29, 2014, 8:33 a.m. UTC
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>
---

--> Applied, thanks. <--

 drivers/mfd/omap-usb-host.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Comments

Greg Kroah-Hartman July 29, 2014, 2:57 p.m. UTC | #1
On Tue, Jul 29, 2014 at 09:33:25AM +0100, Lee Jones wrote:
> 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>
> ---
> 
> --> Applied, thanks. <--
> 
>  drivers/mfd/omap-usb-host.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Lee Jones July 29, 2014, 3:10 p.m. UTC | #2
On Tue, 29 Jul 2014, Greg KH wrote:

> On Tue, Jul 29, 2014 at 09:33:25AM +0100, Lee Jones wrote:
> > 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>
> > ---
> > 
> > --> Applied, thanks. <--
> > 
> >  drivers/mfd/omap-usb-host.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> <formletter>
> 
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
> for how to do this properly.
> 
> </formletter>

It was worth a try. ;)

Patch queued for MFD -next and 'Cc: stable@vger.kernel.org' tag added.
diff mbox

Patch

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index b48d80c..33a9234 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;
 			}
 		}