From fe786367eeeea189d01d591c035532a72b9dab48 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Tue, 22 Jan 2013 14:39:54 +0100
Subject: [PATCH] --- yaml --- r: 358736 b: refs/heads/master c:
 83cfd72669ff708c9d21f214606be785ea8a685c h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/video/backlight/pwm_bl.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5244ce81a4a2..028560f07d70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 928c44775bbf312332c5cb8df7c7451c1d8fba25
+refs/heads/master: 83cfd72669ff708c9d21f214606be785ea8a685c
diff --git a/trunk/drivers/video/backlight/pwm_bl.c b/trunk/drivers/video/backlight/pwm_bl.c
index 4af6d1302f17..a71ef4a79ec4 100644
--- a/trunk/drivers/video/backlight/pwm_bl.c
+++ b/trunk/drivers/video/backlight/pwm_bl.c
@@ -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--;
 	}
@@ -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);