---

yaml --- r: 375970 b: refs/heads/master c: a9b1bdd h: refs/heads/master v: v3
git-mirror · May 15, 2013 · 88d2baa · 88d2baa
1 parent f544eca
commit 88d2baa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8a0b5c687bfc3fce4bcc6a1e7c354f40b38bbc9
+refs/heads/master: a9b1bddc7a171c89b4fd4c132202b5b2118f3905
diff --git a/trunk/drivers/usb/phy/phy-gpio-vbus-usb.c b/trunk/drivers/usb/phy/phy-gpio-vbus-usb.c
@@ -343,7 +343,6 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
 		gpio_free(pdata->gpio_pullup);
 	gpio_free(pdata->gpio_vbus);
 err_gpio:
-	platform_set_drvdata(pdev, NULL);
 	kfree(gpio_vbus->phy.otg);
 	kfree(gpio_vbus);
 	return err;
@@ -365,7 +364,6 @@ static int __exit gpio_vbus_remove(struct platform_device *pdev)
 	if (gpio_is_valid(pdata->gpio_pullup))
 		gpio_free(pdata->gpio_pullup);
 	gpio_free(gpio);
-	platform_set_drvdata(pdev, NULL);
 	kfree(gpio_vbus->phy.otg);
 	kfree(gpio_vbus);