diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 12:35:23 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 12:35:23 +0200 |
| commit | 2314b69253a42f8814cd6e3830b8538b815f1c11 (patch) | |
| tree | 5113d59410630b78c37bebd513e0f7fe9391e710 /drivers/acpi/scan.c | |
| parent | Linux 3.10-rc4 (diff) | |
| parent | ACPI / PM: Do not execute _PS0 for devices without _PSC during initialization (diff) | |
| download | linux-2314b69253a42f8814cd6e3830b8538b815f1c11.tar.xz linux-2314b69253a42f8814cd6e3830b8538b815f1c11.zip | |
Merge branch 'acpi-fixes'
* acpi-fixes:
ACPI / PM: Do not execute _PS0 for devices without _PSC during initialization
ACPI / scan: do not match drivers against objects having scan handlers
ACPI / APEI: fix error return code in ghes_probe()
ACPI / video: ignore BIOS initial backlight value for HP Pavilion g6
ACPI / video: ignore BIOS initial backlight value for HP m4
x86 / platform / hp_wmi: Fix bluetooth_rfkill misuse in hp_wmi_rfkill_setup()
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 44225cb15f3a..90c5759e1355 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -740,6 +740,10 @@ static int acpi_bus_match(struct device *dev, struct device_driver *drv) struct acpi_device *acpi_dev = to_acpi_device(dev); struct acpi_driver *acpi_drv = to_acpi_driver(drv); + /* Skip ACPI device objects with scan handlers attached. */ + if (acpi_dev->handler) + return 0; + return acpi_dev->flags.match_driver && !acpi_match_device_ids(acpi_dev, acpi_drv->ids); } |