Re: [PATCH 2/4] pwm_backlight: Validate dft_brightness in main probe function
From: Peter Ujfalusi <hidden>
Date: 2013-01-31 12:38:44
Also in:
linux-devicetree, lkml
Hi Thierry, On 01/22/2013 02:39 PM, Peter Ujfalusi wrote:
Move the dft_brightness validity check from the DT parsing function to the main probe. In this way we can validate it in case we are booting with or without DT.
Based on the discussion the rest of the series is going to be dropped, but what about this single patch? I think it is still addresses a valid issue, which is that in non DT boot we do not check if the dft_brightness is within valid range. I can resend this patch alone since it is not going to apply on mainline as it is. -- Péter
quoted hunk ↗ jump to hunk
Signed-off-by: Peter Ujfalusi <redacted> --- drivers/video/backlight/pwm_bl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index f0d6854..2a81c24 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c@@ -135,12 +135,6 @@ static int pwm_backlight_parse_dt(struct device *dev, if (ret < 0) return ret; - if (value >= data->max_brightness) { - dev_warn(dev, "invalid default brightness level: %u, using %u\n", - value, data->max_brightness - 1); - value = data->max_brightness - 1; - } - data->dft_brightness = value; }@@ -249,6 +243,12 @@ static int pwm_backlight_probe(struct platform_device *pdev) goto err_alloc; } + if (data->dft_brightness > data->max_brightness) { + dev_warn(&pdev->dev, + "invalid default brightness level: %u, using %u\n", + data->dft_brightness, data->max_brightness); + data->dft_brightness = data->max_brightness; + } bl->props.brightness = data->dft_brightness; backlight_update_status(bl);