[PATCH] drivers/video/backlight/lp855x_bl.c: fix setting initial value for max_brightness and brightness

[PATCH] drivers/video/backlight/lp855x_bl.c: fix setting initial value for max_brightness and brightness

[Axel Lin]

Current code does not always ensure
pdata->initial_brightness <= pdata->max_brightness <= MAX_BRIGHTNESS.
Fix it.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/video/backlight/lp855x_bl.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index d32c097..29a3af2 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -24,6 +24,7 @@
 
 #define BUF_SIZE		(20)
 #define DEFAULT_BL_NAME		"lcd-backlight"
+#define MAX_BRIGHTNESS		255
 
 struct lp855x {
 	const char *chipid;
@@ -171,10 +172,14 @@ static int lp855x_backlight_register(struct lp855x *lp)
 	char *name = pdata->name ? : DEFAULT_BL_NAME;
 
 	props.type = BACKLIGHT_PLATFORM;
+
+	if (pdata->max_brightness > MAX_BRIGHTNESS)
+		pdata->max_brightness = MAX_BRIGHTNESS;
+	props.max_brightness = pdata->max_brightness;
+
+	if (pdata->initial_brightness > pdata->max_brightness)
+		pdata->initial_brightness = pdata->max_brightness;
 	props.brightness = pdata->initial_brightness;
-	props.max_brightness =
-		(pdata->max_brightness < pdata->initial_brightness) ?
-		255 : pdata->max_brightness;
 
 	bl = backlight_device_register(name, lp->dev, lp,
 				       &lp855x_bl_ops, &props);
-- 
1.7.5.4

RE: [PATCH] drivers/video/backlight/lp855x_bl.c: fix setting initial value for max_brightness and brightness

[Kim, Milo]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 2202 bytes --]

Thanks for this patch.

But it would be better if max_brightness of platform data is removed.
Actually, there is no need to use max_brightness in the platform data.
All LP855x devices have 8-bit brightness control register.
Simply, value of max_brightness can be set to 255.

I'll send the patch for this.

Thanks & BR
Milo -

> -----Original Message-----
> From: Axel Lin [mailto:axel.lin@gmail.com]
> Sent: Sunday, February 19, 2012 4:08 PM
> To: linux-kernel@vger.kernel.org
> Cc: Richard Purdie; Kim, Milo; Andrew Morton
> Subject: [PATCH] drivers/video/backlight/lp855x_bl.c: fix setting
> initial value for max_brightness and brightness
> 
> Current code does not always ensure
> pdata->initial_brightness <= pdata->max_brightness <= MAX_BRIGHTNESS.
> Fix it.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
>  drivers/video/backlight/lp855x_bl.c |   11 ++++++++---
>  1 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/video/backlight/lp855x_bl.c
> b/drivers/video/backlight/lp855x_bl.c
> index d32c097..29a3af2 100644
> --- a/drivers/video/backlight/lp855x_bl.c
> +++ b/drivers/video/backlight/lp855x_bl.c
> @@ -24,6 +24,7 @@
> 
>  #define BUF_SIZE		(20)
>  #define DEFAULT_BL_NAME		"lcd-backlight"
> +#define MAX_BRIGHTNESS		255
> 
>  struct lp855x {
>  	const char *chipid;
> @@ -171,10 +172,14 @@ static int lp855x_backlight_register(struct
> lp855x *lp)
>  	char *name = pdata->name ? : DEFAULT_BL_NAME;
> 
>  	props.type = BACKLIGHT_PLATFORM;
> +
> +	if (pdata->max_brightness > MAX_BRIGHTNESS)
> +		pdata->max_brightness = MAX_BRIGHTNESS;
> +	props.max_brightness = pdata->max_brightness;
> +
> +	if (pdata->initial_brightness > pdata->max_brightness)
> +		pdata->initial_brightness = pdata->max_brightness;
>  	props.brightness = pdata->initial_brightness;
> -	props.max_brightness =
> -		(pdata->max_brightness < pdata->initial_brightness) ?
> -		255 : pdata->max_brightness;
> 
>  	bl = backlight_device_register(name, lp->dev, lp,
>  				       &lp855x_bl_ops, &props);
> --
> 1.7.5.4
> 
> 

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥