diff --git a/[refs] b/[refs]
index 0c4246290ff1..f8e3dfc40bfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99f80cfc00084a4aa87372095cca7a279db12ce2
+refs/heads/master: 8fe61203687a67eb1db338a4b7198a8037ca96c8
diff --git a/trunk/drivers/usb/phy/phy-nop.c b/trunk/drivers/usb/phy/phy-nop.c
index 2b10cc969bbb..638cc5dade35 100644
--- a/trunk/drivers/usb/phy/phy-nop.c
+++ b/trunk/drivers/usb/phy/phy-nop.c
@@ -254,8 +254,6 @@ static int nop_usb_xceiv_remove(struct platform_device *pdev)
 
 	usb_remove_phy(&nop->phy);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }