diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-08-31 00:04:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 00:21:55 -0400 |
commit | 98a3c781057fa43494e7e8b39d639e93fca0ecbf (patch) | |
tree | 73a0cdcac3ec6ca0257de607efcfbedc8897fc07 /drivers/video/aty/aty128fb.c | |
parent | 9129d6ea475b7e9f216c8324ea05b7a0d8aba540 (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/aty/aty128fb.c')
-rw-r--r-- | drivers/video/aty/aty128fb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 3e827e04a2aa..106d428b72c9 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
@@ -1800,6 +1800,9 @@ static struct backlight_properties aty128_bl_data = { | |||
1800 | 1800 | ||
1801 | static void aty128_bl_set_power(struct fb_info *info, int power) | 1801 | static void aty128_bl_set_power(struct fb_info *info, int power) |
1802 | { | 1802 | { |
1803 | if (info->bl_dev == NULL) | ||
1804 | return; | ||
1805 | |||
1803 | mutex_lock(&info->bl_mutex); | 1806 | mutex_lock(&info->bl_mutex); |
1804 | up(&info->bl_dev->sem); | 1807 | up(&info->bl_dev->sem); |
1805 | info->bl_dev->props->power = power; | 1808 | info->bl_dev->props->power = power; |
@@ -1828,7 +1831,7 @@ static void aty128_bl_init(struct aty128fb_par *par) | |||
1828 | bd = backlight_device_register(name, par, &aty128_bl_data); | 1831 | bd = backlight_device_register(name, par, &aty128_bl_data); |
1829 | if (IS_ERR(bd)) { | 1832 | if (IS_ERR(bd)) { |
1830 | info->bl_dev = NULL; | 1833 | info->bl_dev = NULL; |
1831 | printk("aty128: Backlight registration failed\n"); | 1834 | printk(KERN_WARNING "aty128: Backlight registration failed\n"); |
1832 | goto error; | 1835 | goto error; |
1833 | } | 1836 | } |
1834 | 1837 | ||