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/atyfb_base.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/atyfb_base.c')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 053ff63365b7..510e4ea296ed 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2199,6 +2199,9 @@ static struct backlight_properties aty_bl_data = { | |||
2199 | 2199 | ||
2200 | static void aty_bl_set_power(struct fb_info *info, int power) | 2200 | static void aty_bl_set_power(struct fb_info *info, int power) |
2201 | { | 2201 | { |
2202 | if (info->bl_dev == NULL) | ||
2203 | return; | ||
2204 | |||
2202 | mutex_lock(&info->bl_mutex); | 2205 | mutex_lock(&info->bl_mutex); |
2203 | up(&info->bl_dev->sem); | 2206 | up(&info->bl_dev->sem); |
2204 | info->bl_dev->props->power = power; | 2207 | info->bl_dev->props->power = power; |
@@ -2223,7 +2226,7 @@ static void aty_bl_init(struct atyfb_par *par) | |||
2223 | bd = backlight_device_register(name, par, &aty_bl_data); | 2226 | bd = backlight_device_register(name, par, &aty_bl_data); |
2224 | if (IS_ERR(bd)) { | 2227 | if (IS_ERR(bd)) { |
2225 | info->bl_dev = NULL; | 2228 | info->bl_dev = NULL; |
2226 | printk("aty: Backlight registration failed\n"); | 2229 | printk(KERN_WARNING "aty: Backlight registration failed\n"); |
2227 | goto error; | 2230 | goto error; |
2228 | } | 2231 | } |
2229 | 2232 | ||