---

yaml --- r: 195414 b: refs/heads/master c: da01c7a h: refs/heads/master v: v3
git-mirror · May 20, 2010 · 8b4a782 · 8b4a782
1 parent 2f0f155
commit 8b4a782
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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);