summaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg/gpio_vbus.c
diff options
context:
space:
mode:
authorShinya Kuribayashi2012-05-10 03:31:51 +0200
committerGreg Kroah-Hartman2012-05-14 18:01:50 +0200
commit0d13eebcab76ff8f2b5e479747f66ffbf6c78b57 (patch)
treedef844fefe54da426764a10754701f246315920a /drivers/usb/otg/gpio_vbus.c
parentusb: Kconfig: remove unneeded default value (diff)
downloadkernel-qcow2-linux-0d13eebcab76ff8f2b5e479747f66ffbf6c78b57.tar.gz
kernel-qcow2-linux-0d13eebcab76ff8f2b5e479747f66ffbf6c78b57.tar.xz
kernel-qcow2-linux-0d13eebcab76ff8f2b5e479747f66ffbf6c78b57.zip
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/gpio_vbus.c')
-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)
return 0;
err_otg:
- free_irq(irq, &pdev->dev);
+ free_irq(irq, pdev);
err_irq:
if (gpio_is_valid(pdata->gpio_pullup))
gpio_free(pdata->gpio_pullup);
@@ -341,7 +341,7 @@ static int __exit gpio_vbus_remove(struct platform_device *pdev)
usb_set_transceiver(NULL);
- free_irq(gpio_to_irq(gpio), &pdev->dev);
+ free_irq(gpio_to_irq(gpio), pdev);
if (gpio_is_valid(pdata->gpio_pullup))
gpio_free(pdata->gpio_pullup);
gpio_free(gpio);