aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg
diff options
context:
space:
mode:
authorShinya Kuribayashi <shinya.kuribayashi.px@renesas.com>2012-05-09 21:31:51 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-14 12:01:50 -0400
commit0d13eebcab76ff8f2b5e479747f66ffbf6c78b57 (patch)
treedef844fefe54da426764a10754701f246315920a /drivers/usb/otg
parent1b0159bab9f1948856915a6cb1f509fe5d8679df (diff)
USB: gpio_vbus: fix inconsistent 'dev_id' parameters at free_irq()
'dev_id' has to be the same with the one passed to request_irq(). Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/otg')
-rw-r--r--drivers/usb/otg/gpio_vbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c
index a0a2178974fe..5a13657ef077 100644
--- a/drivers/usb/otg/gpio_vbus.c
+++ b/drivers/usb/otg/gpio_vbus.c
@@ -319,7 +319,7 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
319 319
320 return 0; 320 return 0;
321err_otg: 321err_otg:
322 free_irq(irq, &pdev->dev); 322 free_irq(irq, pdev);
323err_irq: 323err_irq:
324 if (gpio_is_valid(pdata->gpio_pullup)) 324 if (gpio_is_valid(pdata->gpio_pullup))
325 gpio_free(pdata->gpio_pullup); 325 gpio_free(pdata->gpio_pullup);
@@ -341,7 +341,7 @@ static int __exit gpio_vbus_remove(struct platform_device *pdev)
341 341
342 usb_set_transceiver(NULL); 342 usb_set_transceiver(NULL);
343 343
344 free_irq(gpio_to_irq(gpio), &pdev->dev); 344 free_irq(gpio_to_irq(gpio), pdev);
345 if (gpio_is_valid(pdata->gpio_pullup)) 345 if (gpio_is_valid(pdata->gpio_pullup))
346 gpio_free(pdata->gpio_pullup); 346 gpio_free(pdata->gpio_pullup);
347 gpio_free(gpio); 347 gpio_free(gpio);