Skip to content

Commit

Permalink
eeepc-wmi: real touchpad led device id is 0x001000012
Browse files Browse the repository at this point in the history
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
  • Loading branch information
Corentin Chary authored and Matthew Garrett committed Mar 28, 2011
1 parent c14d4b8 commit 8571d75
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/platform/x86/eeepc-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ MODULE_ALIAS("wmi:"EEEPC_WMI_MGMT_GUID);
#define EEEPC_WMI_DEVID_BRIGHTNESS 0x00050012
#define EEEPC_WMI_DEVID_CAMERA 0x00060013
#define EEEPC_WMI_DEVID_CARDREADER 0x00080013
#define EEEPC_WMI_DEVID_TPDLED 0x00100011
#define EEEPC_WMI_DEVID_TOUCHPAD_LED 0x00100012

#define EEEPC_WMI_DSTS_STATUS_BIT 0x00000001
#define EEEPC_WMI_DSTS_PRESENCE_BIT 0x00010000
Expand Down Expand Up @@ -303,7 +303,7 @@ static void tpd_led_update(struct work_struct *work)
eeepc = container_of(work, struct eeepc_wmi, tpd_led_work);

ctrl_param = eeepc->tpd_led_wk;
eeepc_wmi_set_devstate(EEEPC_WMI_DEVID_TPDLED, ctrl_param, NULL);
eeepc_wmi_set_devstate(EEEPC_WMI_DEVID_TOUCHPAD_LED, ctrl_param, NULL);
}

static void tpd_led_set(struct led_classdev *led_cdev,
Expand All @@ -317,9 +317,9 @@ static void tpd_led_set(struct led_classdev *led_cdev,
queue_work(eeepc->led_workqueue, &eeepc->tpd_led_work);
}

static int read_tpd_state(struct eeepc_wmi *eeepc)
static int read_tpd_led_state(struct eeepc_wmi *eeepc)
{
return eeepc_wmi_get_devstate_simple(EEEPC_WMI_DEVID_TPDLED);
return eeepc_wmi_get_devstate_simple(EEEPC_WMI_DEVID_TOUCHPAD_LED);
}

static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)
Expand All @@ -328,14 +328,14 @@ static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)

eeepc = container_of(led_cdev, struct eeepc_wmi, tpd_led);

return read_tpd_state(eeepc);
return read_tpd_led_state(eeepc);
}

static int eeepc_wmi_led_init(struct eeepc_wmi *eeepc)
{
int rv;

if (read_tpd_state(eeepc) < 0)
if (read_tpd_led_state(eeepc) < 0)
return 0;

eeepc->led_workqueue = create_singlethread_workqueue("led_workqueue");
Expand Down

0 comments on commit 8571d75

Please sign in to comment.