diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-07-02 04:10:41 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-07-25 22:02:19 +0200 |
| commit | 354b2eac3848bddbcb111079138b907ccca70ae8 (patch) | |
| tree | e200bd9ec54378d02a0420191ae06075ff7bf6d5 /drivers/ata | |
| parent | Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream (diff) | |
| download | linux-354b2eac3848bddbcb111079138b907ccca70ae8.tar.xz linux-354b2eac3848bddbcb111079138b907ccca70ae8.zip | |
libata-acpi: fix up for acpi_pm_device_sleep_state API
After merging the libata tree, today's [2012-07-01] linux-next build (x86_64
allmodconfig) failed like this:
drivers/ata/libata-acpi.c: In function 'ata_acpi_set_state':
drivers/ata/libata-acpi.c:872:5: error: too few arguments to function 'acpi_pm_device_sleep_state'
include/acpi/acpi_bus.h:418:5: note: declared here
Caused by commit 3bd46600a7a7 ("libata-acpi: add ata port runtime D3Cold
support") from the libata tree interacting with commit ee85f543710d
("ACPI/PM: specify lowest allowed state for device sleep state") from the
pci tree.
This patch adds ACPI_STATE_D3 as the new third parameter to
acpi_pm_device_sleep_state()
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index f1d6901de37d..902b5a457170 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -869,7 +869,7 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) if (state.event != PM_EVENT_ON) { acpi_state = acpi_pm_device_sleep_state( - &dev->sdev->sdev_gendev, NULL); + &dev->sdev->sdev_gendev, NULL, ACPI_STATE_D3); if (acpi_state > 0) acpi_bus_set_power(handle, acpi_state); /* TBD: need to check if it's runtime pm request */ |