Messages in this thread Patch in this message |  | | Subject | [PATCH] drivers/video/backlight/lp855x_bl.c: fix setting initial value for max_brightness and brightness | From | Axel Lin <> | Date | Sun, 19 Feb 2012 15:08:22 +0800 |
| |
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
|  |