diff options
author | Paul Mackerras | 2006-08-31 07:45:48 +0200 |
---|---|---|
committer | Paul Mackerras | 2006-08-31 07:45:48 +0200 |
commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /drivers/video/aty/atyfb_base.c | |
parent | [POWERPC] Only offer CONFIG_BRIQ_PANEL if CONFIG_PPC_CHRP is enabled (diff) | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
download | kernel-qcow2-linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.tar.gz kernel-qcow2-linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.tar.xz kernel-qcow2-linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.zip |
Merge branch 'merge'
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 = { static void aty_bl_set_power(struct fb_info *info, int power) { + if (info->bl_dev == NULL) + return; + mutex_lock(&info->bl_mutex); up(&info->bl_dev->sem); info->bl_dev->props->power = power; @@ -2223,7 +2226,7 @@ static void aty_bl_init(struct atyfb_par *par) bd = backlight_device_register(name, par, &aty_bl_data); if (IS_ERR(bd)) { info->bl_dev = NULL; - printk("aty: Backlight registration failed\n"); + printk(KERN_WARNING "aty: Backlight registration failed\n"); goto error; } |