| 1 | From 159c4d81899db05a57bc4a0d55083e484c3d8a43 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 19/21] 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 | --- a/drivers/video/fbmem.c |
| 12 | +++ b/drivers/video/fbmem.c |
| 13 | @@ -1046,12 +1046,12 @@ fb_set_var(struct fb_info *info, struct |
| 14 | int |
| 15 | fb_blank(struct fb_info *info, int blank) |
| 16 | { |
| 17 | - int ret = -EINVAL; |
| 18 | + int ret = 0; |
| 19 | |
| 20 | if (blank > FB_BLANK_POWERDOWN) |
| 21 | blank = FB_BLANK_POWERDOWN; |
| 22 | |
| 23 | - if (info->fbops->fb_blank) |
| 24 | + if (info->fbops->fb_blank && blank == FB_BLANK_UNBLANK) |
| 25 | ret = info->fbops->fb_blank(blank, info); |
| 26 | |
| 27 | if (!ret) { |
| 28 | @@ -1062,6 +1062,10 @@ fb_blank(struct fb_info *info, int blank |
| 29 | fb_notifier_call_chain(FB_EVENT_BLANK, &event); |
| 30 | } |
| 31 | |
| 32 | + if (info->fbops->fb_blank && blank != FB_BLANK_UNBLANK) |
| 33 | + ret = info->fbops->fb_blank(blank, info); |
| 34 | + |
| 35 | + |
| 36 | return ret; |
| 37 | } |
| 38 | |
| 39 | |
