From 23170d0e245c17de620002bac01f807d45f750a7 Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Tue, 20 Sep 2011 09:16:11 -0700 Subject: [PATCH] --- yaml --- r: 271985 b: refs/heads/master c: bee460be8c691c544e84ed678280ace6153104c6 h: refs/heads/master i: 271983: 86c82e046e0ec2a580cf596ca3560491c0b3c667 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/samsung-laptop.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 473368b6313e..3d2f343c19d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 093ed561648d43263c009ea88abab21a31cd4f1d +refs/heads/master: bee460be8c691c544e84ed678280ace6153104c6 diff --git a/trunk/drivers/platform/x86/samsung-laptop.c b/trunk/drivers/platform/x86/samsung-laptop.c index 37374a5878eb..7eb6733138e6 100644 --- a/trunk/drivers/platform/x86/samsung-laptop.c +++ b/trunk/drivers/platform/x86/samsung-laptop.c @@ -370,15 +370,17 @@ static u8 read_brightness(void) &sretval); if (!retval) { user_brightness = sretval.retval[0]; - if (user_brightness != 0) + if (user_brightness > sabi_config->min_brightness) user_brightness -= sabi_config->min_brightness; + else + user_brightness = 0; } return user_brightness; } static void set_brightness(u8 user_brightness) { - u8 user_level = user_brightness - sabi_config->min_brightness; + u8 user_level = user_brightness + sabi_config->min_brightness; sabi_set_command(sabi_config->commands.set_brightness, user_level); } @@ -811,7 +813,8 @@ static int __init samsung_init(void) /* create a backlight device to talk to this one */ memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_PLATFORM; - props.max_brightness = sabi_config->max_brightness; + props.max_brightness = sabi_config->max_brightness - + sabi_config->min_brightness; backlight_device = backlight_device_register("samsung", &sdev->dev, NULL, &backlight_ops, &props);