From c7700fa672bf0a171ceb9f4b092de33e3b306243 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 24 Apr 2010 12:23:28 +0200 Subject: [PATCH 14/32] Framebuffer notifier: Call notifier callbacks prior to blanking the screen --- drivers/video/fbmem.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 5aac00e..b1beaa7 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -1032,12 +1032,12 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) int fb_blank(struct fb_info *info, int blank) { - int ret = -EINVAL; + int ret = 0; if (blank > FB_BLANK_POWERDOWN) blank = FB_BLANK_POWERDOWN; - if (info->fbops->fb_blank) + if (info->fbops->fb_blank && blank == FB_BLANK_UNBLANK) ret = info->fbops->fb_blank(blank, info); if (!ret) { @@ -1048,6 +1048,10 @@ fb_blank(struct fb_info *info, int blank) fb_notifier_call_chain(FB_EVENT_BLANK, &event); } + if (info->fbops->fb_blank && blank != FB_BLANK_UNBLANK) + ret = info->fbops->fb_blank(blank, info); + + return ret; } -- 1.7.4.1