diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 16:05:39 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 16:05:39 +0000 |
commit | 55a4edad38edf2bad2658b8580401fabb5cfdcc2 (patch) | |
tree | 85a1da14dbb9456bc2860f86ab724fd3d09676fe /drivers/video/backlight/lcd.c | |
parent | 0fc24c1ebff281406d66840cbaa6d303bc2cae24 (diff) | |
parent | b59c8471fbbccd67941ccf93362eb48f212077f5 (diff) |
Merge branch 's3c64xx-drivers' into s3c64xx
Diffstat (limited to 'drivers/video/backlight/lcd.c')
-rw-r--r-- | drivers/video/backlight/lcd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c index 8e1731d3b22..680e57b616c 100644 --- a/drivers/video/backlight/lcd.c +++ b/drivers/video/backlight/lcd.c @@ -42,10 +42,13 @@ static int fb_notifier_callback(struct notifier_block *self, mutex_lock(&ld->ops_lock); if (!ld->ops->check_fb || ld->ops->check_fb(ld, evdata->info)) { - if (event == FB_EVENT_BLANK) - ld->ops->set_power(ld, *(int *)evdata->data); - else - ld->ops->set_mode(ld, evdata->data); + if (event == FB_EVENT_BLANK) { + if (ld->ops->set_power) + ld->ops->set_power(ld, *(int *)evdata->data); + } else { + if (ld->ops->set_mode) + ld->ops->set_mode(ld, evdata->data); + } } mutex_unlock(&ld->ops_lock); return 0; |