From 7b0ecc28a5e92e1f27bd3e55ee3310861bb8f0f9 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Wed, 15 Aug 2012 18:10:03 +0200
Subject: [PATCH] --- yaml --- r: 344511 b: refs/heads/master c:
 656d4f332c02b14e62fe3f4247a1dcdc33961de6 h: refs/heads/master i:   344509:
 bd5d4be643dcd2d1ea9ccf188cef6ff84498a5e3   344507:
 8fa3973c71ef983ed71f602ef2a9be58672677bf   344503:
 3dfa042ba93dd936794baea2fbe9dcff44efe4a3   344495:
 66a36e7c16b7754ffdb058ddf946f6906d1c539a   344479:
 c9ff3c4f9d4928ee0bb51be615232354e17a4d02   344447:
 a9e92ac487ba9577194bb86beaa28c3823505a61 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/video/sh_mobile_lcdcfb.c | 3 ++-
 trunk/drivers/video/sh_mobile_lcdcfb.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8483c82e284f..faf10627410b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 074d0da486e2a5b8e80c35070ede7104f302f6da
+refs/heads/master: 656d4f332c02b14e62fe3f4247a1dcdc33961de6
diff --git a/trunk/drivers/video/sh_mobile_lcdcfb.c b/trunk/drivers/video/sh_mobile_lcdcfb.c
index c169581c3a72..dd8dd41b4acd 100644
--- a/trunk/drivers/video/sh_mobile_lcdcfb.c
+++ b/trunk/drivers/video/sh_mobile_lcdcfb.c
@@ -2282,6 +2282,7 @@ static int sh_mobile_lcdc_update_bl(struct backlight_device *bdev)
 	    bdev->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
 		brightness = 0;
 
+	ch->bl_brightness = brightness;
 	return ch->cfg->bl_info.set_brightness(brightness);
 }
 
@@ -2289,7 +2290,7 @@ static int sh_mobile_lcdc_get_brightness(struct backlight_device *bdev)
 {
 	struct sh_mobile_lcdc_chan *ch = bl_get_data(bdev);
 
-	return ch->cfg->bl_info.get_brightness();
+	return ch->bl_brightness;
 }
 
 static int sh_mobile_lcdc_check_fb(struct backlight_device *bdev,
diff --git a/trunk/drivers/video/sh_mobile_lcdcfb.h b/trunk/drivers/video/sh_mobile_lcdcfb.h
index 0f92f6544b94..f839adef1d90 100644
--- a/trunk/drivers/video/sh_mobile_lcdcfb.h
+++ b/trunk/drivers/video/sh_mobile_lcdcfb.h
@@ -94,6 +94,7 @@ struct sh_mobile_lcdc_chan {
 
 	/* Backlight */
 	struct backlight_device *bl;
+	unsigned int bl_brightness;
 
 	/* FB */
 	struct fb_info *info;