Skip to content

Commit

Permalink
pwm_backlight: Validate dft_brightness in main probe function
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
  • Loading branch information
Peter Ujfalusi authored and Thierry Reding committed Jan 31, 2013
1 parent 928c447 commit 83cfd72
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/video/backlight/pwm_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,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;
data->max_brightness--;
}
Expand Down Expand Up @@ -248,6 +242,13 @@ 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);

Expand Down

0 comments on commit 83cfd72

Please sign in to comment.