Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 8571d75d614702e3e0278c92892012dbf7c2e65b

Authored by Corentin Chary
Committed by Matthew Garrett
1 parent c14d4b8ea7
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

drivers/platform/x86/eeepc-wmi.c
Diff comments   View file @ 8571d75
... ... @@ -77,7 +77,7 @@
77 77 #define EEEPC_WMI_DEVID_BRIGHTNESS 0x00050012
78 78 #define EEEPC_WMI_DEVID_CAMERA 0x00060013
79 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 82 #define EEEPC_WMI_DSTS_STATUS_BIT 0x00000001
83 83 #define EEEPC_WMI_DSTS_PRESENCE_BIT 0x00010000
... ... @@ -303,7 +303,7 @@
303 303 eeepc = container_of(work, struct eeepc_wmi, tpd_led_work);
304 304  
305 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  
309 309 static void tpd_led_set(struct led_classdev *led_cdev,
310 310  
... ... @@ -317,9 +317,9 @@
317 317 queue_work(eeepc->led_workqueue, &eeepc->tpd_led_work);
318 318 }
319 319  
320   -static int read_tpd_state(struct eeepc_wmi *eeepc)
  320 +static 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  
325 325 static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)
326 326  
... ... @@ -328,14 +328,14 @@
328 328  
329 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  
334 334 static int eeepc_wmi_led_init(struct eeepc_wmi *eeepc)
335 335 {
336 336 int rv;
337 337  
338   - if (read_tpd_state(eeepc) < 0)
  338 + if (read_tpd_led_state(eeepc) < 0)
339 339 return 0;
340 340  
341 341 eeepc->led_workqueue = create_singlethread_workqueue("led_workqueue");