summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-omap.c
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2012-05-09 10:31:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-09 15:20:12 -0700
commit7b18389dd4fe0b178117b09d054e214297f7e677 (patch)
treec5ae1c2e4318049e8ee01a02948e839139381858 /drivers/usb/host/ehci-omap.c
parent1f339d84407eda744caa5b361d67019c66532d5d (diff)
downloadblackbird-op-linux-7b18389dd4fe0b178117b09d054e214297f7e677.tar.gz
blackbird-op-linux-7b18389dd4fe0b178117b09d054e214297f7e677.zip
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>
Diffstat (limited to 'drivers/usb/host/ehci-omap.c')
-rw-r--r--drivers/usb/host/ehci-omap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index e669c6a7e91e..a44294d13494 100644
--- 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);
OpenPOWER on IntegriCloud