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/nvidia | |
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/nvidia')
-rw-r--r-- | drivers/video/nvidia/nv_backlight.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c index b45f577094ac..14c37c42191c 100644 --- a/drivers/video/nvidia/nv_backlight.c +++ b/drivers/video/nvidia/nv_backlight.c | |||
@@ -112,6 +112,8 @@ static struct backlight_properties nvidia_bl_data = { | |||
112 | 112 | ||
113 | void nvidia_bl_set_power(struct fb_info *info, int power) | 113 | void nvidia_bl_set_power(struct fb_info *info, int power) |
114 | { | 114 | { |
115 | if (info->bl_dev == NULL) | ||
116 | return; | ||
115 | mutex_lock(&info->bl_mutex); | 117 | mutex_lock(&info->bl_mutex); |
116 | up(&info->bl_dev->sem); | 118 | up(&info->bl_dev->sem); |
117 | info->bl_dev->props->power = power; | 119 | info->bl_dev->props->power = power; |
@@ -140,7 +142,7 @@ void nvidia_bl_init(struct nvidia_par *par) | |||
140 | bd = backlight_device_register(name, par, &nvidia_bl_data); | 142 | bd = backlight_device_register(name, par, &nvidia_bl_data); |
141 | if (IS_ERR(bd)) { | 143 | if (IS_ERR(bd)) { |
142 | info->bl_dev = NULL; | 144 | info->bl_dev = NULL; |
143 | printk("nvidia: Backlight registration failed\n"); | 145 | printk(KERN_WARNING "nvidia: Backlight registration failed\n"); |
144 | goto error; | 146 | goto error; |
145 | } | 147 | } |
146 | 148 | ||