ARM: OMAP: USB: fix warning on EHCI PHY reset path

When PHY reset pin is connected to a GPIO on external GPIO chip
(e.g. I2C), we should not call the gpio_set_value() function, but
gpio_set_value_cansleep().

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Felipe Balbi <balbi@ti.com>
Tested-by: Govindraj.R <govindraj.raja@ti.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index e669c6a7e91e32b5affcbfaaf10cc78b9b619467..a44294d13494a8c985a887db01e07a6cbe984277 100644 (file)
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -249,10 +249,10 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
                udelay(10);
 
                if (gpio_is_valid(pdata->reset_gpio_port[0]))
-                       gpio_set_value(pdata->reset_gpio_port[0], 1);
+                       gpio_set_value_cansleep(pdata->reset_gpio_port[0], 1);
 
                if (gpio_is_valid(pdata->reset_gpio_port[1]))
-                       gpio_set_value(pdata->reset_gpio_port[1], 1);
+                       gpio_set_value_cansleep(pdata->reset_gpio_port[1], 1);
        }
 
        ret = usb_add_hcd(hcd, irq, IRQF_SHARED);