| 1 | From 0c5669e6b4e4ada7f9a3caf0b51b906b5602f260 Mon Sep 17 00:00:00 2001 |
| 2 | From: Lars-Peter Clausen <lars@metafoo.de> |
| 3 | Date: Sat, 24 Apr 2010 12:23:28 +0200 |
| 4 | Subject: [PATCH 20/28] Framebuffer notifier: Call notifier callbacks prior to |
| 5 | blanking the screen |
| 6 | |
| 7 | --- |
| 8 | drivers/video/fbmem.c | 8 ++++++-- |
| 9 | 1 files changed, 6 insertions(+), 2 deletions(-) |
| 10 | |
| 11 | diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c |
| 12 | index ad93629..e13e6bf 100644 |
| 13 | --- a/drivers/video/fbmem.c |
| 14 | +++ b/drivers/video/fbmem.c |
| 15 | @@ -1032,12 +1032,12 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) |
| 16 | int |
| 17 | fb_blank(struct fb_info *info, int blank) |
| 18 | { |
| 19 | - int ret = -EINVAL; |
| 20 | + int ret = 0; |
| 21 | |
| 22 | if (blank > FB_BLANK_POWERDOWN) |
| 23 | blank = FB_BLANK_POWERDOWN; |
| 24 | |
| 25 | - if (info->fbops->fb_blank) |
| 26 | + if (info->fbops->fb_blank && blank == FB_BLANK_UNBLANK) |
| 27 | ret = info->fbops->fb_blank(blank, info); |
| 28 | |
| 29 | if (!ret) { |
| 30 | @@ -1048,6 +1048,10 @@ fb_blank(struct fb_info *info, int blank) |
| 31 | fb_notifier_call_chain(FB_EVENT_BLANK, &event); |
| 32 | } |
| 33 | |
| 34 | + if (info->fbops->fb_blank && blank != FB_BLANK_UNBLANK) |
| 35 | + ret = info->fbops->fb_blank(blank, info); |
| 36 | + |
| 37 | + |
| 38 | return ret; |
| 39 | } |
| 40 | |
| 41 | -- |
| 42 | 1.7.5.4 |
| 43 | |
| 44 | |
