The patch below does not apply to the 3.2-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From 1e7caf8bcf1b49eae152ad7cf442775472dd587c Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <[email protected]>
Date: Wed, 21 Mar 2012 14:38:55 +0100
Subject: [PATCH] USB: ohci-at91: fix vbus_pin_active_low handling

The information is not properly taken into account
for {get|set}_power() functions.

Signed-off-by: Nicolas Ferre <[email protected]>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Acked-by: Alan Stern <[email protected]>
Cc: stable <[email protected]>             [3.2+]

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index db8963f..4d266ae 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -247,7 +247,7 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data 
*pdata, int port, int
                return;
 
        gpio_set_value(pdata->vbus_pin[port],
-                      !pdata->vbus_pin_active_low[port] ^ enable);
+                      pdata->vbus_pin_active_low[port] ^ enable);
 }
 
 static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
@@ -259,7 +259,7 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data 
*pdata, int port)
                return -EINVAL;
 
        return gpio_get_value(pdata->vbus_pin[port]) ^
-               !pdata->vbus_pin_active_low[port];
+               pdata->vbus_pin_active_low[port];
 }
 
 /*

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to