From f421e7140d9f8462db34c806fd94306eb726a271 Mon Sep 17 00:00:00 2001
From: Fabio Baltieri <fabio.baltieri@linaro.org>
Date: Wed, 3 Apr 2013 10:45:03 +0200
Subject: [PATCH] --- yaml --- r: 364799 b: refs/heads/master c:
 81ef6724302e0c7ba3f087403de24760601b1839 h: refs/heads/master i:   364797:
 244fd6c8f53c0dbb7ed9508737cdb285240f4670   364795:
 43bcfb458d49c1a701baa34eef8f68972f0eaa62   364791:
 7e8970202753ece602eb1e2d37ed11418f86efb3   364783:
 577dd05f57c97f0456a4f73df417df9ce9e76d2e   364767:
 b3dce0486284cf91476e4a33fba8af8d9172e55f   364735:
 8697e020f9b70433e109146852688e1a8c4bc37f   364671:
 fca8e84d636227fe9081d82ef4e977669fd04dae   364543:
 0e4ad2a9b4f550caa3691e3c20af2d249b6a3d04 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/usb/phy/phy-ab8500-usb.c | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index f4ddacb2f2d8..93e6320f3c75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee1f2e6e51581d5cb9c312161a9a9b2f18f25bf
+refs/heads/master: 81ef6724302e0c7ba3f087403de24760601b1839
diff --git a/trunk/drivers/usb/phy/phy-ab8500-usb.c b/trunk/drivers/usb/phy/phy-ab8500-usb.c
index 351b0369a611..ab6dd072ae25 100644
--- a/trunk/drivers/usb/phy/phy-ab8500-usb.c
+++ b/trunk/drivers/usb/phy/phy-ab8500-usb.c
@@ -628,15 +628,13 @@ static int ab8500_usb_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	ab = kzalloc(sizeof *ab, GFP_KERNEL);
+	ab = devm_kzalloc(&pdev->dev, sizeof(*ab), GFP_KERNEL);
 	if (!ab)
 		return -ENOMEM;
 
-	otg = kzalloc(sizeof *otg, GFP_KERNEL);
-	if (!otg) {
-		kfree(ab);
+	otg = devm_kzalloc(&pdev->dev, sizeof(*otg), GFP_KERNEL);
+	if (!otg)
 		return -ENOMEM;
-	}
 
 	ab->dev			= &pdev->dev;
 	ab->ab8500		= ab8500;
@@ -665,12 +663,12 @@ static int ab8500_usb_probe(struct platform_device *pdev)
 
 	err = ab8500_usb_irq_setup(pdev, ab);
 	if (err < 0)
-		goto fail;
+		return err;
 
 	err = usb_add_phy(&ab->phy, USB_PHY_TYPE_USB2);
 	if (err) {
 		dev_err(&pdev->dev, "Can't register transceiver\n");
-		goto fail;
+		return err;
 	}
 
 	/* Needed to enable ID detection. */
@@ -679,10 +677,6 @@ static int ab8500_usb_probe(struct platform_device *pdev)
 	dev_info(&pdev->dev, "revision 0x%2x driver initialized\n", rev);
 
 	return 0;
-fail:
-	kfree(otg);
-	kfree(ab);
-	return err;
 }
 
 static int ab8500_usb_remove(struct platform_device *pdev)
@@ -700,9 +694,6 @@ static int ab8500_usb_remove(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, NULL);
 
-	kfree(ab->phy.otg);
-	kfree(ab);
-
 	return 0;
 }