From 25f5327f2469ca34e00b29369159adc10f525d1d Mon Sep 17 00:00:00 2001 From: Ping Cheng Date: Tue, 4 Oct 2011 23:49:42 -0700 Subject: [PATCH] --- yaml --- r: 269487 b: refs/heads/master c: f4fa9a6d80a61e5ae01e41262ff8b913deb92378 h: refs/heads/master i: 269485: a674c4cc8beeabc25ebfd5497c136a58bc566546 269483: 42983c7a20552c94732fb7d1fd4a3bea56e97de6 269479: fe445d4f67196adf9d9cefa3cf252fce6a1e5137 269471: 3efb322fbb7e228b79c40cf1bdd2bb56213876ef v: v3 --- [refs] | 2 +- trunk/Documentation/ABI/testing/sysfs-driver-wacom | 3 ++- trunk/drivers/input/tablet/wacom_sys.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d68940e492d6..2b25d388e37f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f01536e3d68bacaf827325b716c743c542d20b64 +refs/heads/master: f4fa9a6d80a61e5ae01e41262ff8b913deb92378 diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-wacom b/trunk/Documentation/ABI/testing/sysfs-driver-wacom index dfe1d460cf54..b1d5c17dd67f 100644 --- a/trunk/Documentation/ABI/testing/sysfs-driver-wacom +++ b/trunk/Documentation/ABI/testing/sysfs-driver-wacom @@ -25,7 +25,8 @@ Contact: linux-input@vger.kernel.org Description: Writing to this file sets the status LED luminance (0..127) when the stylus does not touch the tablet surface, and no - button is pressed on the stylus. + button is pressed on the stylus. This luminance level is + normally lower than the level when a button is pressed. What: /sys/bus/usb/devices/-:./wacom_led/status1_luminance Date: August 2011 diff --git a/trunk/drivers/input/tablet/wacom_sys.c b/trunk/drivers/input/tablet/wacom_sys.c index 0eccf57df5cd..4f5e62a1621d 100644 --- a/trunk/drivers/input/tablet/wacom_sys.c +++ b/trunk/drivers/input/tablet/wacom_sys.c @@ -678,7 +678,7 @@ static int wacom_initialize_leds(struct wacom *wacom) /* Initialize default values */ wacom->led.select = 0; - wacom->led.llv = 30; + wacom->led.llv = 10; wacom->led.hlv = 20; wacom->led.img_lum = 10; wacom_led_control(wacom);