aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin Chary <corentincj@iksaif.net>2011-02-06 07:28:41 -0500
committerMatthew Garrett <mjg@redhat.com>2011-03-28 06:05:19 -0400
commit8571d75d614702e3e0278c92892012dbf7c2e65b (patch)
treed66fd1f45b76dbc9e6a83e5700d1d088269e999b
parentc14d4b8ea799515cd44134b8eddd8f789f0b6286 (diff)
eeepc-wmi: real touchpad led device id is 0x001000012
Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r--drivers/platform/x86/eeepc-wmi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index bc7133345674..898476716246 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -77,7 +77,7 @@ MODULE_ALIAS("wmi:"EEEPC_WMI_MGMT_GUID);
77#define EEEPC_WMI_DEVID_BRIGHTNESS 0x00050012 77#define EEEPC_WMI_DEVID_BRIGHTNESS 0x00050012
78#define EEEPC_WMI_DEVID_CAMERA 0x00060013 78#define EEEPC_WMI_DEVID_CAMERA 0x00060013
79#define EEEPC_WMI_DEVID_CARDREADER 0x00080013 79#define EEEPC_WMI_DEVID_CARDREADER 0x00080013
80#define EEEPC_WMI_DEVID_TPDLED 0x00100011 80#define EEEPC_WMI_DEVID_TOUCHPAD_LED 0x00100012
81 81
82#define EEEPC_WMI_DSTS_STATUS_BIT 0x00000001 82#define EEEPC_WMI_DSTS_STATUS_BIT 0x00000001
83#define EEEPC_WMI_DSTS_PRESENCE_BIT 0x00010000 83#define EEEPC_WMI_DSTS_PRESENCE_BIT 0x00010000
@@ -303,7 +303,7 @@ static void tpd_led_update(struct work_struct *work)
303 eeepc = container_of(work, struct eeepc_wmi, tpd_led_work); 303 eeepc = container_of(work, struct eeepc_wmi, tpd_led_work);
304 304
305 ctrl_param = eeepc->tpd_led_wk; 305 ctrl_param = eeepc->tpd_led_wk;
306 eeepc_wmi_set_devstate(EEEPC_WMI_DEVID_TPDLED, ctrl_param, NULL); 306 eeepc_wmi_set_devstate(EEEPC_WMI_DEVID_TOUCHPAD_LED, ctrl_param, NULL);
307} 307}
308 308
309static void tpd_led_set(struct led_classdev *led_cdev, 309static void tpd_led_set(struct led_classdev *led_cdev,
@@ -317,9 +317,9 @@ static void tpd_led_set(struct led_classdev *led_cdev,
317 queue_work(eeepc->led_workqueue, &eeepc->tpd_led_work); 317 queue_work(eeepc->led_workqueue, &eeepc->tpd_led_work);
318} 318}
319 319
320static int read_tpd_state(struct eeepc_wmi *eeepc) 320static int read_tpd_led_state(struct eeepc_wmi *eeepc)
321{ 321{
322 return eeepc_wmi_get_devstate_simple(EEEPC_WMI_DEVID_TPDLED); 322 return eeepc_wmi_get_devstate_simple(EEEPC_WMI_DEVID_TOUCHPAD_LED);
323} 323}
324 324
325static enum led_brightness tpd_led_get(struct led_classdev *led_cdev) 325static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)
@@ -328,14 +328,14 @@ static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)
328 328
329 eeepc = container_of(led_cdev, struct eeepc_wmi, tpd_led); 329 eeepc = container_of(led_cdev, struct eeepc_wmi, tpd_led);
330 330
331 return read_tpd_state(eeepc); 331 return read_tpd_led_state(eeepc);
332} 332}
333 333
334static int eeepc_wmi_led_init(struct eeepc_wmi *eeepc) 334static int eeepc_wmi_led_init(struct eeepc_wmi *eeepc)
335{ 335{
336 int rv; 336 int rv;
337 337
338 if (read_tpd_state(eeepc) < 0) 338 if (read_tpd_led_state(eeepc) < 0)
339 return 0; 339 return 0;
340 340
341 eeepc->led_workqueue = create_singlethread_workqueue("led_workqueue"); 341 eeepc->led_workqueue = create_singlethread_workqueue("led_workqueue");