From 8b4a7823cab1d1fe4ef4b89a349ab0c5972d514c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter.korsgaard@barco.com>
Date: Mon, 26 Apr 2010 10:05:06 +0200
Subject: [PATCH] --- yaml --- r: 195414 b: refs/heads/master c:
 da01c7a49bfc94dbfa66af5ca5e1063b10bc6a10 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/usb/gadget/hid.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aa1142afb271..119e2b1dec7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe662b43521a8b8ad2dc79299922d0b0bb3fe728
+refs/heads/master: da01c7a49bfc94dbfa66af5ca5e1063b10bc6a10
diff --git a/trunk/drivers/usb/gadget/hid.c b/trunk/drivers/usb/gadget/hid.c
index b77e97754b4a..775722686ed8 100644
--- a/trunk/drivers/usb/gadget/hid.c
+++ b/trunk/drivers/usb/gadget/hid.c
@@ -275,8 +275,18 @@ MODULE_LICENSE("GPL");
 
 static int __init hidg_init(void)
 {
-	platform_driver_probe(&hidg_plat_driver, hidg_plat_driver_probe);
-	return usb_composite_register(&hidg_driver);
+	int status;
+
+	status = platform_driver_probe(&hidg_plat_driver,
+				hidg_plat_driver_probe);
+	if (status < 0)
+		return status;
+
+	status = usb_composite_register(&hidg_driver);
+	if (status < 0)
+		platform_driver_unregister(&hidg_plat_driver);
+
+	return status;
 }
 module_init(hidg_init);