diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 15:55:19 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 15:55:19 +0200 |
commit | 52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6 (patch) | |
tree | 4dde4eeb3f6ce7a4d3b68f4ab9adfc60da519a6e /drivers/acpi/scan.c | |
parent | c7208164e66f63e3ec1759b98087849286410741 (diff) | |
parent | 3022f4de491c096650d55ae9d562a9c811830724 (diff) | |
download | lwn-52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6.tar.gz lwn-52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6.zip |
Merge branch 'acpi-lpss' into acpi-enumeration
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 7efe546a8c42..df6e4c924b35 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1551,9 +1551,13 @@ static void acpi_bus_get_power_flags(struct acpi_device *device) */ if (acpi_has_method(device->handle, "_PSC")) device->power.flags.explicit_get = 1; + if (acpi_has_method(device->handle, "_IRC")) device->power.flags.inrush_current = 1; + if (acpi_has_method(device->handle, "_DSW")) + device->power.flags.dsw_present = 1; + /* * Enumerate supported power management states */ |