From d01b25e6c28bd71ca2fe280931564b965d042bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= Date: Sun, 21 Feb 2010 00:20:01 +0100 Subject: [PATCH] --- yaml --- r: 188179 b: refs/heads/master c: 57e148b6a975980944f4466ccb669b1d02dfc6a1 h: refs/heads/master i: 188177: 7de62e0c1f802b4589720002c10b8ac1d4ba4414 188175: 1928c823d61cf063cb94f62753e22b708afdb93d v: v3 --- [refs] | 2 +- trunk/drivers/video/backlight/adx_bl.c | 2 +- trunk/drivers/video/backlight/backlight.c | 2 +- trunk/include/linux/backlight.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 673ad7cc0bf0..48651711ae55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4ebb780e194e8751dc22deeabcddd3fdc8f18f0 +refs/heads/master: 57e148b6a975980944f4466ccb669b1d02dfc6a1 diff --git a/trunk/drivers/video/backlight/adx_bl.c b/trunk/drivers/video/backlight/adx_bl.c index d769b0bab21a..a683dd1be4bc 100644 --- a/trunk/drivers/video/backlight/adx_bl.c +++ b/trunk/drivers/video/backlight/adx_bl.c @@ -56,7 +56,7 @@ static int adx_backlight_get_brightness(struct backlight_device *bldev) return brightness & 0xff; } -static int adx_backlight_check_fb(struct fb_info *fb) +static int adx_backlight_check_fb(struct backlight_device *bldev, struct fb_info *fb) { return 1; } diff --git a/trunk/drivers/video/backlight/backlight.c b/trunk/drivers/video/backlight/backlight.c index 18829cf68b1b..b800cd4eeec8 100644 --- a/trunk/drivers/video/backlight/backlight.c +++ b/trunk/drivers/video/backlight/backlight.c @@ -38,7 +38,7 @@ static int fb_notifier_callback(struct notifier_block *self, mutex_lock(&bd->ops_lock); if (bd->ops) if (!bd->ops->check_fb || - bd->ops->check_fb(evdata->info)) { + bd->ops->check_fb(bd, evdata->info)) { bd->props.fb_blank = *(int *)evdata->data; if (bd->props.fb_blank == FB_BLANK_UNBLANK) bd->props.state &= ~BL_CORE_FBBLANK; diff --git a/trunk/include/linux/backlight.h b/trunk/include/linux/backlight.h index ee377d791996..21cd866d24cd 100644 --- a/trunk/include/linux/backlight.h +++ b/trunk/include/linux/backlight.h @@ -47,7 +47,7 @@ struct backlight_ops { int (*get_brightness)(struct backlight_device *); /* Check if given framebuffer device is the one bound to this backlight; return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */ - int (*check_fb)(struct fb_info *); + int (*check_fb)(struct backlight_device *, struct fb_info *); }; /* This structure defines all the properties of a backlight */