Skip to content

Commit

Permalink
eeepc-laptop: makes get_acpi() returns -ENODEV
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Corentin Chary authored and Len Brown committed Jun 26, 2009
1 parent 1ddec2f commit f36509e
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions drivers/platform/x86/eeepc-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) \
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f36509e

Please sign in to comment.