diff options
| author | Len Brown | 2008-10-23 05:19:50 +0200 |
|---|---|---|
| committer | Len Brown | 2008-10-23 05:19:50 +0200 |
| commit | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (patch) | |
| tree | f5978cfdc2b5ede82445de6675301a0171e66ea0 /drivers/misc | |
| parent | Merge branch 'acer-wmi' into test (diff) | |
| parent | ACPI: Fix possible null ptr dereference (diff) | |
| download | kernel-qcow2-linux-955ba395616a78780e70dc3f3b0b56ca4db52e5c.tar.gz kernel-qcow2-linux-955ba395616a78780e70dc3f3b0b56ca4db52e5c.tar.xz kernel-qcow2-linux-955ba395616a78780e70dc3f3b0b56ca4db52e5c.zip | |
Merge branch 'bugfixes' into test
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/acer-wmi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c index cf4c39fbc66f..0532a2de2ce4 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/misc/acer-wmi.c @@ -473,7 +473,7 @@ struct wmi_interface *iface) } break; default: - return AE_BAD_ADDRESS; + return AE_ERROR; } return AE_OK; } @@ -511,7 +511,7 @@ static acpi_status AMW0_set_u32(u32 value, u32 cap, struct wmi_interface *iface) break; } default: - return AE_BAD_ADDRESS; + return AE_ERROR; } /* Actually do the set */ @@ -686,7 +686,7 @@ struct wmi_interface *iface) return 0; } default: - return AE_BAD_ADDRESS; + return AE_ERROR; } status = WMI_execute_u32(method_id, 0, &result); @@ -732,7 +732,7 @@ static acpi_status WMID_set_u32(u32 value, u32 cap, struct wmi_interface *iface) } break; default: - return AE_BAD_ADDRESS; + return AE_ERROR; } return WMI_execute_u32(method_id, (u32)value, NULL); } @@ -782,7 +782,7 @@ static struct wmi_interface wmid_interface = { static acpi_status get_u32(u32 *value, u32 cap) { - acpi_status status = AE_BAD_ADDRESS; + acpi_status status = AE_ERROR; switch (interface->type) { case ACER_AMW0: |