From 80223f2f1a92151ffefcf81e35075e1c02c4c805 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 23 Oct 2012 13:36:43 +0800
Subject: [PATCH] --- yaml --- r: 338591 b: refs/heads/master c:
 4b0de6f38362960460d3693f122c6abe6bb0704b h: refs/heads/master i:   338589:
 c1bf8cdab59178c312984d74d3305d47adb5c468   338587:
 5022bf306758d3537f0bb7b124b9986aa228ec8d   338583:
 95c0ded7a7eba1fac02abc7d9522f01caf5f1664   338575:
 d455fcae222f15e1641545201da0c4c7d0806449   338559:
 4fada6be6b93779e30dd2a541210debf918e73a5 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/usb/musb/ux500.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9d28eec22fae..d0afb466e2f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a81a01f9feab302504c3e43fbece99fd7f578df8
+refs/heads/master: 4b0de6f38362960460d3693f122c6abe6bb0704b
diff --git a/trunk/drivers/usb/musb/ux500.c b/trunk/drivers/usb/musb/ux500.c
index be1430ad60ee..4197f307ae0f 100644
--- a/trunk/drivers/usb/musb/ux500.c
+++ b/trunk/drivers/usb/musb/ux500.c
@@ -159,8 +159,7 @@ static int __devexit ux500_remove(struct platform_device *pdev)
 	struct ux500_glue	*glue = platform_get_drvdata(pdev);
 
 	musb_put_id(&pdev->dev, glue->musb->id);
-	platform_device_del(glue->musb);
-	platform_device_put(glue->musb);
+	platform_device_unregister(glue->musb);
 	clk_disable(glue->clk);
 	clk_put(glue->clk);
 	kfree(glue);