提交 ea79c2ed 编写于 作者: S Sasha Levin 提交者: Greg Kroah-Hartman

usb: fix breakage on systems without ACPI

Commit da0af6e7 ("usb: Bind devices to ACPI devices when possible") really
tries to force-bind devices even when impossible, unlike what it says in
the subject.

CONFIG_ACPI is not an indication that ACPI tables are actually present, nor
is an indication that any USB relevant information is present in them. There
is no reason to fail the creation of a USB bus if it can't bind it to
ACPI device during initialization.

On systems with CONFIG_ACPI set but without ACPI tables it would cause a
boot panic.
Signed-off-by: NSasha Levin <levinsasha928@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 e4083ea5
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册