]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ACPI / scan: do not scan fixed hardware on HW-reduced platform
authorAaron Lu <aaron.lu@intel.com>
Mon, 28 Apr 2014 02:38:04 +0000 (10:38 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Apr 2014 10:16:53 +0000 (12:16 +0200)
Fixed hardware does not exist on HW-reduced ACPI platforms since the
programming interface for them is not implemented on them, so no need
to scan that hardware on them.

This patch avoids creating the fixed power button ACPI device and
eliminates a probe error message from ACPI button driver on ASUS T100.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/scan.c

index 7efe546a8c42704137f3cbae8a3159485f3473b9..db5fc6f9628ebcf1f5efbf8b4bf1d1291c7d94e9 100644 (file)
@@ -2259,12 +2259,16 @@ int __init acpi_scan_init(void)
        if (result)
                goto out;
 
-       result = acpi_bus_scan_fixed();
-       if (result) {
-               acpi_detach_data(acpi_root->handle, acpi_scan_drop_device);
-               acpi_device_del(acpi_root);
-               put_device(&acpi_root->dev);
-               goto out;
+       /* Fixed feature devices do not exist on HW-reduced platform */
+       if (!acpi_gbl_reduced_hardware) {
+               result = acpi_bus_scan_fixed();
+               if (result) {
+                       acpi_detach_data(acpi_root->handle,
+                                        acpi_scan_drop_device);
+                       acpi_device_del(acpi_root);
+                       put_device(&acpi_root->dev);
+                       goto out;
+               }
        }
 
        acpi_update_all_gpes();