From aa69373f0fd2002e32182b15a13b7f53baebbd2e Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Thu, 17 May 2012 20:10:43 +0900 Subject: [PATCH] --- yaml --- r: 303982 b: refs/heads/master c: ec1ac6e1690adf4087afdc706770cb6fb732157b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/otg/gpio_vbus.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3d38db6c1aff..ea71ea12d9fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8240c1b810ac4adc13e04244781db6d2ff272be +refs/heads/master: ec1ac6e1690adf4087afdc706770cb6fb732157b diff --git a/trunk/drivers/usb/otg/gpio_vbus.c b/trunk/drivers/usb/otg/gpio_vbus.c index 00e763ecb55a..1e6bd0347aff 100644 --- a/trunk/drivers/usb/otg/gpio_vbus.c +++ b/trunk/drivers/usb/otg/gpio_vbus.c @@ -348,6 +348,7 @@ static int __exit gpio_vbus_remove(struct platform_device *pdev) struct gpio_vbus_mach_info *pdata = pdev->dev.platform_data; int gpio = pdata->gpio_vbus; + cancel_delayed_work_sync(&gpio_vbus->work); regulator_put(gpio_vbus->vbus_draw); usb_set_transceiver(NULL);