From 0dc6c8d55bc4854d5d9ab7329f0fe84411e8af8b Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Fri, 19 May 2006 16:54:42 -0400 Subject: [PATCH] --- yaml --- r: 32003 b: refs/heads/master c: dc8c2b2744f8563aa5feb07488e4cc207a70ac70 h: refs/heads/master i: 32001: b19a53519c9e836a08ea6d57b2dcc2d73c13e180 31999: ed5d4772605f2e11f599c622af7b6e457e443ad3 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/fan.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0fe858c7708e..8093b112e1f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27b1d3e85b1dfd9037d3fbb98b2e2aacca01da39 +refs/heads/master: dc8c2b2744f8563aa5feb07488e4cc207a70ac70 diff --git a/trunk/drivers/acpi/fan.c b/trunk/drivers/acpi/fan.c index 8abf5ac17f67..a56acdb37296 100644 --- a/trunk/drivers/acpi/fan.c +++ b/trunk/drivers/acpi/fan.c @@ -81,7 +81,7 @@ static int acpi_fan_read_state(struct seq_file *seq, void *offset) if (fan) { - if (acpi_bus_get_power(fan->handle, &state)) + if (acpi_bus_get_power(fan->device->handle, &state)) seq_printf(seq, "status: ERROR\n"); else seq_printf(seq, "status: %s\n", @@ -113,7 +113,7 @@ acpi_fan_write_state(struct file *file, const char __user * buffer, state_string[count] = '\0'; - result = acpi_bus_set_power(fan->handle, + result = acpi_bus_set_power(fan->device->handle, simple_strtoul(state_string, NULL, 0)); if (result) return result; @@ -198,7 +198,7 @@ static int acpi_fan_add(struct acpi_device *device) strcpy(acpi_device_class(device), ACPI_FAN_CLASS); acpi_driver_data(device) = fan; - result = acpi_bus_get_power(fan->handle, &state); + result = acpi_bus_get_power(device->handle, &state); if (result) { printk(KERN_ERR PREFIX "Reading power state\n"); goto end;