---

yaml --- r: 303962 b: refs/heads/master c: ea79c2e h: refs/heads/master v: v3
git-mirror · May 16, 2012 · 7ea9d08 · 7ea9d08
1 parent 9da2dd2
commit 7ea9d08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4083ea5a78d242761507bf61f7e57c7e85b8bd3
+refs/heads/master: ea79c2ed6ec374347e4c61755bcb6fe8c2b24961
diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c
@@ -1015,9 +1015,7 @@ static int __init usb_init(void)
 	if (retval)
 		goto out;
 
-	retval = usb_acpi_register();
-	if (retval)
-		goto acpi_register_failed;
+	usb_acpi_register();
 	retval = bus_register(&usb_bus_type);
 	if (retval)
 		goto bus_register_failed;
@@ -1053,7 +1051,6 @@ static int __init usb_init(void)
 	bus_unregister(&usb_bus_type);
 bus_register_failed:
 	usb_acpi_unregister();
-acpi_register_failed:
 	usb_debugfs_cleanup();
 out:
 	return retval;