diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/usb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 7998a67503c..25d0c61c3f8 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -1015,9 +1015,7 @@ static int __init usb_init(void) | |||
1015 | if (retval) | 1015 | if (retval) |
1016 | goto out; | 1016 | goto out; |
1017 | 1017 | ||
1018 | retval = usb_acpi_register(); | 1018 | usb_acpi_register(); |
1019 | if (retval) | ||
1020 | goto acpi_register_failed; | ||
1021 | retval = bus_register(&usb_bus_type); | 1019 | retval = bus_register(&usb_bus_type); |
1022 | if (retval) | 1020 | if (retval) |
1023 | goto bus_register_failed; | 1021 | goto bus_register_failed; |
@@ -1053,7 +1051,6 @@ bus_notifier_failed: | |||
1053 | bus_unregister(&usb_bus_type); | 1051 | bus_unregister(&usb_bus_type); |
1054 | bus_register_failed: | 1052 | bus_register_failed: |
1055 | usb_acpi_unregister(); | 1053 | usb_acpi_unregister(); |
1056 | acpi_register_failed: | ||
1057 | usb_debugfs_cleanup(); | 1054 | usb_debugfs_cleanup(); |
1058 | out: | 1055 | out: |
1059 | return retval; | 1056 | return retval; |