redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

eeepc-laptop: fix set_acpi() to return non-zero on failure

Browse source 
If the control method does not exist, return -ENODEV for consistency
with get_acpi()

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Alan Jenkins 2009-12-03 07:44:59 +00:00 committed by Len Brown
parent dc56ad9b49
commit 13f70029da
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/platform/x86/eeepc-laptop.c
View file

@ -289,26 +289,30 @@ static int read_acpi_int(acpi_handle handle, const char *method, int *val)
static int set_acpi(int cm, int value)
{
if (ehotk->cm_supported & (0x1 << cm)) {
const char *method = cm_setv[cm];
if (method == NULL)
return -ENODEV;
if (write_acpi_int(ehotk->handle, method, value, NULL))
pr_warning("Error writing %s\n", method);
}
const char *method = cm_setv[cm];
if (method == NULL)
return -ENODEV;
if ((ehotk->cm_supported & (0x1 << cm)) == 0)
return -ENODEV;
if (write_acpi_int(ehotk->handle, method, value, NULL))
pr_warning("Error writing %s\n", method);
return 0;
}
static int get_acpi(int cm)
{
int value = -ENODEV;
if ((ehotk->cm_supported & (0x1 << cm))) {
const char *method = cm_getv[cm];
if (method == NULL)
return -ENODEV;
if (read_acpi_int(ehotk->handle, method, &value))
pr_warning("Error reading %s\n", method);
}
const char *method = cm_getv[cm];
int value;
if (method == NULL)
return -ENODEV;
if ((ehotk->cm_supported & (0x1 << cm)) == 0)
return -ENODEV;
if (read_acpi_int(ehotk->handle, method, &value))
pr_warning("Error reading %s\n", method);
return value;
}