diff options
| author | Corentin Chary <corentincj@iksaif.net> | 2009-06-25 13:25:40 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-06-26 00:23:40 -0400 |
| commit | f36509e7248631671d02f48d1a88f56cdeb54ed8 (patch) | |
| tree | ab824b65e1dce46dc784666301863ed012b1e340 /drivers/platform | |
| parent | 1ddec2f9435e77b4d3f50eced68c4c942f2bcd4b (diff) | |
| download | kernel_samsung_aries-f36509e7248631671d02f48d1a88f56cdeb54ed8.zip kernel_samsung_aries-f36509e7248631671d02f48d1a88f56cdeb54ed8.tar.gz kernel_samsung_aries-f36509e7248631671d02f48d1a88f56cdeb54ed8.tar.bz2 | |
eeepc-laptop: makes get_acpi() returns -ENODEV
If there is there is no getter defined, get_acpi()
will return -ENODEV.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/eeepc-laptop.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 5b102c2..19cc9ae 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -289,7 +289,7 @@ static int set_acpi(int cm, int value) static int get_acpi(int cm) { - int value = -1; + int value = -ENODEV; if ((ehotk->cm_supported & (0x1 << cm))) { const char *method = cm_getv[cm]; if (method == NULL) @@ -367,13 +367,19 @@ static ssize_t store_sys_acpi(int cm, const char *buf, size_t count) rv = parse_arg(buf, count, &value); if (rv > 0) - set_acpi(cm, value); + value = set_acpi(cm, value); + if (value < 0) + return value; return rv; } static ssize_t show_sys_acpi(int cm, char *buf) { - return sprintf(buf, "%d\n", get_acpi(cm)); + int value = get_acpi(cm); + + if (value < 0) + return value; + return sprintf(buf, "%d\n", value); } #define EEEPC_CREATE_DEVICE_ATTR(_name, _cm) \ @@ -1036,8 +1042,9 @@ static int eeepc_new_rfkill(struct rfkill **rfkill, { int result; - if (get_acpi(cm) == -1) - return -ENODEV; + result = get_acpi(cm); + if (result < 0) + return result; *rfkill = rfkill_alloc(name, dev, type, &eeepc_rfkill_ops, (void *)(unsigned long)cm); |