aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2014-04-27 22:38:04 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-04-28 06:16:53 -0400
commit2650ef42636848db858625bd933131e8835f8d23 (patch)
tree034a53144f09781d17bf537e20344abbd051512a
parentd1db0eea852497762cab43b905b879dfcd3b8987 (diff)
ACPI / scan: do not scan fixed hardware on HW-reduced platform
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>
-rw-r--r--drivers/acpi/scan.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7efe546a8c42..db5fc6f9628e 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2259,12 +2259,16 @@ int __init acpi_scan_init(void)
2259 if (result) 2259 if (result)
2260 goto out; 2260 goto out;
2261 2261
2262 result = acpi_bus_scan_fixed(); 2262 /* Fixed feature devices do not exist on HW-reduced platform */
2263 if (result) { 2263 if (!acpi_gbl_reduced_hardware) {
2264 acpi_detach_data(acpi_root->handle, acpi_scan_drop_device); 2264 result = acpi_bus_scan_fixed();
2265 acpi_device_del(acpi_root); 2265 if (result) {
2266 put_device(&acpi_root->dev); 2266 acpi_detach_data(acpi_root->handle,
2267 goto out; 2267 acpi_scan_drop_device);
2268 acpi_device_del(acpi_root);
2269 put_device(&acpi_root->dev);
2270 goto out;
2271 }
2268 } 2272 }
2269 2273
2270 acpi_update_all_gpes(); 2274 acpi_update_all_gpes();