usb: fix breakage on systems without ACPI

[~andy/linux] / drivers / usb / core / usb.c

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 0ce862bfdd77af804551486fd9621315d40196f2..25d0c61c3f8a3045e19fddc35016b35e9c44bd6d 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1015,6 +1015,7 @@ static int __init usb_init(void)
        if (retval)
                goto out;
 
+       usb_acpi_register();
        retval = bus_register(&usb_bus_type);
        if (retval)
                goto bus_register_failed;
@@ -1049,6 +1050,7 @@ major_init_failed:
 bus_notifier_failed:
        bus_unregister(&usb_bus_type);
 bus_register_failed:
+       usb_acpi_unregister();
        usb_debugfs_cleanup();
 out:
        return retval;
@@ -1070,6 +1072,7 @@ static void __exit usb_exit(void)
        usb_hub_cleanup();
        bus_unregister_notifier(&usb_bus_type, &usb_bus_nb);
        bus_unregister(&usb_bus_type);
+       usb_acpi_unregister();
        usb_debugfs_cleanup();
 }