Merge remote-tracking branch 'input/next'

[karo-tx-linux.git] / drivers / acpi / fan.c

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 5b02a0aa540cfa122ecfd8481d38162076cefbde..ba3da88cee45a20479df62023ee560aa422dff22 100644 (file)
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -93,7 +93,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
        if (result)
                return result;
 
-       *state = (acpi_state == ACPI_STATE_D3 ? 0 :
+       *state = (acpi_state == ACPI_STATE_D3_COLD ? 0 :
                 (acpi_state == ACPI_STATE_D0 ? 1 : -1));
        return 0;
 }
@@ -108,7 +108,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
                return -EINVAL;
 
        result = acpi_bus_set_power(device->handle,
-                               state ? ACPI_STATE_D0 : ACPI_STATE_D3);
+                               state ? ACPI_STATE_D0 : ACPI_STATE_D3_COLD);
 
        return result;
 }
@@ -168,7 +168,7 @@ static int acpi_fan_add(struct acpi_device *device)
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
 
-      end:
+end:
        return result;
 }