aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-08-03 19:21:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-03 20:25:22 -0400
commit5d6f921b42749d1a70441685b7a4f2801e12ebfb (patch)
tree6c2bdf6a7de23e7ec7d8d5990586e1a0527164b0 /drivers/video
parent4c4dd903e72507c853b8c2b04b22e0d0c721fd93 (diff)
drivers/video/backlight/aat2870_bl.c: fix setting max_current
- Current implementation tests wrong value for setting aat2870_bl->max_current. - In the current implementation, we cannot differentiate between 2 cases: a) if pdata->max_current is not set , or b) pdata->max_current is set to AAT2870_CURRENT_0_45 (which is also 0). Fix it by setting AAT2870_CURRENT_0_45 to be 1 and adjust the equation in aat2870_brightness() accordingly. Signed-off-by: Axel Lin <axel.lin@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Samuel Ortiz <sameo@linux.intel.com> Tested-by: Jin Park <jinyoungp@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/backlight/aat2870_bl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c
index f13a3f7e2e8..331f1ef1dad 100644
--- a/drivers/video/backlight/aat2870_bl.c
+++ b/drivers/video/backlight/aat2870_bl.c
@@ -44,7 +44,7 @@ static inline int aat2870_brightness(struct aat2870_bl_driver_data *aat2870_bl,
44 struct backlight_device *bd = aat2870_bl->bd; 44 struct backlight_device *bd = aat2870_bl->bd;
45 int val; 45 int val;
46 46
47 val = brightness * aat2870_bl->max_current; 47 val = brightness * (aat2870_bl->max_current - 1);
48 val /= bd->props.max_brightness; 48 val /= bd->props.max_brightness;
49 49
50 return val; 50 return val;
@@ -175,7 +175,7 @@ static int aat2870_bl_probe(struct platform_device *pdev)
175 else 175 else
176 aat2870_bl->channels = AAT2870_BL_CH_ALL; 176 aat2870_bl->channels = AAT2870_BL_CH_ALL;
177 177
178 if (pdata->max_brightness > 0) 178 if (pdata->max_current > 0)
179 aat2870_bl->max_current = pdata->max_current; 179 aat2870_bl->max_current = pdata->max_current;
180 else 180 else
181 aat2870_bl->max_current = AAT2870_CURRENT_27_9; 181 aat2870_bl->max_current = AAT2870_CURRENT_27_9;