diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:46 +0800 |
| commit | dc06d1ba220ca16ebbca598bb45242ec5e818cb2 (patch) | |
| tree | ef66bd14901ec3a07cf65842a3b63884a64be529 /drivers/acpi/power.c | |
| parent | 018ed21cf3b7cb618c63294793d63b23ce4afe24 (diff) | |
| parent | a898540914d4136f29bc738ce593c1c501006f23 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-17.06-androidlsk-v4.1-17.05-androidlinux-linaro-lsk-v4.1-android
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index e0bcfb642b52..39b18f74a539 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -201,6 +201,7 @@ static int acpi_power_get_list_state(struct list_head *list, int *state) return -EINVAL; /* The state of the list is 'on' IFF all resources are 'on'. */ + cur_state = 0; list_for_each_entry(entry, list, node) { struct acpi_power_resource *resource = entry->resource; acpi_handle handle = resource->device.handle; |