From 5933281af69b0862ebb31bb81a0d7a0cf3023968 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date: Sun, 19 Aug 2012 21:54:58 +0200
Subject: [PATCH] --- yaml --- r: 322711 b: refs/heads/master c:
 1b68a4ca2d038addb7314211d122fb6d7002b38b h: refs/heads/master i:   322709:
 332d68b0f2a0a6ca041ed727760204f8ba70baa4   322707:
 f1236a75618dd26be22a624eadba68ccf4ce7dfa   322703:
 181c29310fe0479fdb501d3e31582999b8258e1a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/gadget/dummy_hcd.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 114fcd6150f0..7ad666927960 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e6507bdec67f1c50390a69a14568c5115cc658
+refs/heads/master: 1b68a4ca2d038addb7314211d122fb6d7002b38b
diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c
index b799106027ad..0e58a46956ae 100644
--- a/trunk/drivers/usb/gadget/dummy_hcd.c
+++ b/trunk/drivers/usb/gadget/dummy_hcd.c
@@ -2503,10 +2503,8 @@ static int dummy_hcd_probe(struct platform_device *pdev)
 	hs_hcd->has_tt = 1;
 
 	retval = usb_add_hcd(hs_hcd, 0, 0);
-	if (retval != 0) {
-		usb_put_hcd(hs_hcd);
-		return retval;
-	}
+	if (retval)
+		goto put_usb2_hcd;
 
 	if (mod_data.is_super_speed) {
 		ss_hcd = usb_create_shared_hcd(&dummy_hcd, &pdev->dev,
@@ -2525,6 +2523,8 @@ static int dummy_hcd_probe(struct platform_device *pdev)
 put_usb3_hcd:
 	usb_put_hcd(ss_hcd);
 dealloc_usb2_hcd:
+	usb_remove_hcd(hs_hcd);
+put_usb2_hcd:
 	usb_put_hcd(hs_hcd);
 	the_controller.hs_hcd = the_controller.ss_hcd = NULL;
 	return retval;