aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/riva/fbdev.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-08-31 00:04:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-31 00:21:55 -0400
commit98a3c781057fa43494e7e8b39d639e93fca0ecbf (patch)
tree73a0cdcac3ec6ca0257de607efcfbedc8897fc07 /drivers/video/riva/fbdev.c
parent9129d6ea475b7e9f216c8324ea05b7a0d8aba540 (diff)
[PATCH] fbdev: Fix crashes in various fbdev's blank routines
The backlight changes that went in had a bug where they could cause the kernel to access an unitialized pointer when blanking if there is no backlight control on a machine. The bug affects atyfb, aty128fb, nvidiafb and rivafb. radeonfb seems to be ok. This fixes it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/riva/fbdev.c')
-rw-r--r--drivers/video/riva/fbdev.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 76fc9d355eb7..90363943bd57 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -354,6 +354,9 @@ static struct backlight_properties riva_bl_data = {
354 354
355static void riva_bl_set_power(struct fb_info *info, int power) 355static void riva_bl_set_power(struct fb_info *info, int power)
356{ 356{
357 if (info->bl_dev == NULL)
358 return;
359
357 mutex_lock(&info->bl_mutex); 360 mutex_lock(&info->bl_mutex);
358 up(&info->bl_dev->sem); 361 up(&info->bl_dev->sem);
359 info->bl_dev->props->power = power; 362 info->bl_dev->props->power = power;
@@ -382,7 +385,7 @@ static void riva_bl_init(struct riva_par *par)
382 bd = backlight_device_register(name, par, &riva_bl_data); 385 bd = backlight_device_register(name, par, &riva_bl_data);
383 if (IS_ERR(bd)) { 386 if (IS_ERR(bd)) {
384 info->bl_dev = NULL; 387 info->bl_dev = NULL;
385 printk("riva: Backlight registration failed\n"); 388 printk(KERN_WARNING "riva: Backlight registration failed\n");
386 goto error; 389 goto error;
387 } 390 }
388 391