Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 119183
b: refs/heads/master
c: b3b4dc8
h: refs/heads/master
i:
  119181: 02f4e8f
  119179: 5ab2780
  119175: 3d11c81
  119167: c1abd82
v: v3
  • Loading branch information
Ben Dooks authored and Linus Torvalds committed Nov 20, 2008
1 parent 47a4394 commit 558e759
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c267fd777a478d74fa8959628538b64088f67fd2
refs/heads/master: b3b4dc8840a8fdbe495723d35cd976d781fd42fa
11 changes: 7 additions & 4 deletions trunk/drivers/video/backlight/lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 558e759

Please sign in to comment.