From 8db63fa8aecd57b47f4fd8ca6b346f659bd6c9f2 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Fri, 28 Aug 2009 12:56:47 +0000 Subject: [PATCH] --- yaml --- r: 165239 b: refs/heads/master c: abfa57e15acaa6e1ec567c250e5212bc55d79e43 h: refs/heads/master i: 165237: 55a3043c853c8c78b9ef666f5589a0255b6fa44a 165235: 9419169eb7df3dc20e50f5629776d8bfb6f604b5 165231: b7ad3d7c6dd5ad91709c2ecfb7867de7fa1c7ad4 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/asus-laptop.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3f9deb05eecd..76e575ecd907 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d4a3800c764d111d67462a14589ed1611b2f55e +refs/heads/master: abfa57e15acaa6e1ec567c250e5212bc55d79e43 diff --git a/trunk/drivers/platform/x86/asus-laptop.c b/trunk/drivers/platform/x86/asus-laptop.c index 23449508d86b..88cc9a1045b4 100644 --- a/trunk/drivers/platform/x86/asus-laptop.c +++ b/trunk/drivers/platform/x86/asus-laptop.c @@ -246,12 +246,15 @@ static struct workqueue_struct *led_workqueue; #define ASUS_LED(object, ledname) \ static void object##_led_set(struct led_classdev *led_cdev, \ enum led_brightness value); \ + static enum led_brightness object##_led_get( \ + struct led_classdev *led_cdev); \ static void object##_led_update(struct work_struct *ignored); \ static int object##_led_wk; \ static DECLARE_WORK(object##_led_work, object##_led_update); \ static struct led_classdev object##_led = { \ .name = "asus::" ledname, \ .brightness_set = object##_led_set, \ + .brightness_get = object##_led_get, \ } ASUS_LED(mled, "mail"); @@ -399,6 +402,11 @@ static void write_status(acpi_handle handle, int out, int mask) { \ int value = object##_led_wk; \ write_status(object##_set_handle, value, (mask)); \ + } \ + static enum led_brightness object##_led_get( \ + struct led_classdev *led_cdev) \ + { \ + return led_cdev->brightness; \ } ASUS_LED_HANDLER(mled, MLED_ON);