From 5eb8780e06a229359c671f0cc907aed69ab0e747 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Wed, 9 May 2012 10:31:35 +0300 Subject: [PATCH] --- yaml --- r: 303877 b: refs/heads/master c: 7b18389dd4fe0b178117b09d054e214297f7e677 h: refs/heads/master i: 303875: 6a08a8842b5c520964a61710b09efde69bbfe07b v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-omap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 745e01bd98f4..e464fa5cb19f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f339d84407eda744caa5b361d67019c66532d5d +refs/heads/master: 7b18389dd4fe0b178117b09d054e214297f7e677 diff --git a/trunk/drivers/usb/host/ehci-omap.c b/trunk/drivers/usb/host/ehci-omap.c index e669c6a7e91e..a44294d13494 100644 --- a/trunk/drivers/usb/host/ehci-omap.c +++ b/trunk/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);