From 558e7599cfc15da99c8b5b104fb27acf2d1b94df Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Wed, 19 Nov 2008 15:36:25 -0800 Subject: [PATCH] --- yaml --- r: 119183 b: refs/heads/master c: b3b4dc8840a8fdbe495723d35cd976d781fd42fa h: refs/heads/master i: 119181: 02f4e8fd9f77266c6e5defda4882d70f08e05bfd 119179: 5ab278092f75caa615faf5c5d92186c128bd4ea4 119175: 3d11c81670529873b9924ab6208169808b1a2469 119167: c1abd82aa38e7d99cab604b8be6b0120ba2870cb v: v3 --- [refs] | 2 +- trunk/drivers/video/backlight/lcd.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 989bd492e244..d0ee906bdbf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c267fd777a478d74fa8959628538b64088f67fd2 +refs/heads/master: b3b4dc8840a8fdbe495723d35cd976d781fd42fa diff --git a/trunk/drivers/video/backlight/lcd.c b/trunk/drivers/video/backlight/lcd.c index 8e1731d3b228..680e57b616cd 100644 --- a/trunk/drivers/video/backlight/lcd.c +++ b/trunk/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;