From c52303838a419bf8e7ae1bf0fa8d73a72d51c890 Mon Sep 17 00:00:00 2001
From: Andrew Bresticker <abrestic@chromium.org>
Date: Mon, 29 Apr 2013 16:17:58 -0700
Subject: [PATCH] --- yaml --- r: 365653 b: refs/heads/master c:
 46e1915eef9c0e935a09808a30e167abb857b4ec h: refs/heads/master i:   365651:
 61b972301e71b24c27c8b934bd03f8271bf5e877 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/video/backlight/platform_lcd.c | 6 ++++++
 trunk/include/video/platform_lcd.h           | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9aba829c1d4b..e93dcb56b86c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40d88fc60d426b0e1306adf6ec0be9da164e5d2a
+refs/heads/master: 46e1915eef9c0e935a09808a30e167abb857b4ec
diff --git a/trunk/drivers/video/backlight/platform_lcd.c b/trunk/drivers/video/backlight/platform_lcd.c
index 54d94de652b0..056836706708 100644
--- a/trunk/drivers/video/backlight/platform_lcd.c
+++ b/trunk/drivers/video/backlight/platform_lcd.c
@@ -86,6 +86,12 @@ static int platform_lcd_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
+	if (pdata->probe) {
+		err = pdata->probe(pdata);
+		if (err)
+			return err;
+	}
+
 	plcd = devm_kzalloc(&pdev->dev, sizeof(struct platform_lcd),
 			    GFP_KERNEL);
 	if (!plcd) {
diff --git a/trunk/include/video/platform_lcd.h b/trunk/include/video/platform_lcd.h
index ad3bdfe743b2..23864b284147 100644
--- a/trunk/include/video/platform_lcd.h
+++ b/trunk/include/video/platform_lcd.h
@@ -15,6 +15,7 @@ struct plat_lcd_data;
 struct fb_info;
 
 struct plat_lcd_data {
+	int	(*probe)(struct plat_lcd_data *);
 	void	(*set_power)(struct plat_lcd_data *, unsigned int power);
 	int	(*match_fb)(struct plat_lcd_data *, struct fb_info *);
 };