From ae39b0201dddf67904e6ef6349bded8c6b62faef Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Thu, 10 May 2012 10:31:51 +0900 Subject: [PATCH] --- yaml --- r: 303932 b: refs/heads/master c: 0d13eebcab76ff8f2b5e479747f66ffbf6c78b57 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/otg/gpio_vbus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d3890395f891..4a38145049ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b0159bab9f1948856915a6cb1f509fe5d8679df +refs/heads/master: 0d13eebcab76ff8f2b5e479747f66ffbf6c78b57 diff --git a/trunk/drivers/usb/otg/gpio_vbus.c b/trunk/drivers/usb/otg/gpio_vbus.c index a0a2178974fe..5a13657ef077 100644 --- a/trunk/drivers/usb/otg/gpio_vbus.c +++ b/trunk/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);