From c1ec2429c2c699caa66dd9047ff7fdc05e6b1c07 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Fri, 15 Jul 2011 17:35:12 +0100
Subject: [PATCH] --- yaml --- r: 260065 b: refs/heads/master c:
 83c871ee2b60619d74d03eaf6f75a7d9c3cb0e45 h: refs/heads/master i:   260063:
 558bc7075141b0bf3cd713d4aad418365bdb992f v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/gma500/mrst_device.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a2120fff8ef0..20a28410c53d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f642062fc7a6bebdd857408e7a9f678bfd2e4004
+refs/heads/master: 83c871ee2b60619d74d03eaf6f75a7d9c3cb0e45
diff --git a/trunk/drivers/staging/gma500/mrst_device.c b/trunk/drivers/staging/gma500/mrst_device.c
index 573142f13f83..6707fafbfa1e 100644
--- a/trunk/drivers/staging/gma500/mrst_device.c
+++ b/trunk/drivers/staging/gma500/mrst_device.c
@@ -157,14 +157,12 @@ static int device_backlight_init(struct drm_device *dev)
 	value /= bl_max_freq;
 	value /= blc_pwm_precision_factor;
 
+	if (value > (unsigned long long)MRST_BLC_MAX_PWM_REG_FREQ)
+			return -ERANGE;
+
 	if (gma_power_begin(dev, false)) {
-		if (value > (unsigned long long)MRST_BLC_MAX_PWM_REG_FREQ)
-				return -ERANGE;
-		else {
-			REG_WRITE(BLC_PWM_CTL2,
-					(0x80000000 | REG_READ(BLC_PWM_CTL2)));
-			REG_WRITE(BLC_PWM_CTL, value | (value << 16));
-		}
+		REG_WRITE(BLC_PWM_CTL2, (0x80000000 | REG_READ(BLC_PWM_CTL2)));
+		REG_WRITE(BLC_PWM_CTL, value | (value << 16));
 		gma_power_end(dev);
 	}
 	return 0;