Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...

[linux-2.6-omap-h63xx.git] / drivers / pnp / pnpacpi / core.c

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 616fc72190bfd9ad007c459bc142e063a6150d2f..dada89906314c7103b89b6e96a071afe3900d74d 100644 (file)
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -130,11 +130,16 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
 #ifdef CONFIG_ACPI_SLEEP
 static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
 {
-       return acpi_bus_set_power((acpi_handle) dev->data,
-                                 acpi_pm_device_sleep_state(&dev->dev,
-                                                            device_may_wakeup
-                                                            (&dev->dev),
-                                                            NULL));
+       int power_state;
+
+       power_state = acpi_pm_device_sleep_state(&dev->dev,
+                                               device_may_wakeup(&dev->dev),
+                                               NULL);
+       if (power_state < 0)
+               power_state = (state.event == PM_EVENT_ON) ?
+                               ACPI_STATE_D0 : ACPI_STATE_D3;
+
+       return acpi_bus_set_power((acpi_handle) dev->data, power_state);
 }
 
 static int pnpacpi_resume(struct pnp_dev *dev)
@@ -166,7 +171,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
            is_exclusive_device(device))
                return 0;
 
-       pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
        dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
        if (!dev) {
                pnp_err("Out of memory");
@@ -248,9 +252,9 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
        num++;
 
        return AE_OK;
-      err1:
+err1:
        kfree(dev_id);
-      err:
+err:
        kfree(dev);
        return -EINVAL;
 }