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 *); };