Merge xburst target.
[openwrt/svn-archive/archive.git] / target / linux / xburst / patches-2.6.32 / 420-fb-notifier-pre-post.patch
1 From 2d00c901d3a438c6f750f8b13b329845775ec3b5 Mon Sep 17 00:00:00 2001
2 From: Lars-Peter Clausen <lars@metafoo.de>
3 Date: Mon, 11 Jan 2010 04:29:50 +0100
4 Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/420-fb-notifier-pre-post.patch
5
6 ---
7 drivers/video/fbmem.c | 8 ++++++--
8 1 files changed, 6 insertions(+), 2 deletions(-)
9
10 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
11 index 99bbd28..5e121b8 100644
12 --- a/drivers/video/fbmem.c
13 +++ b/drivers/video/fbmem.c
14 @@ -1008,12 +1008,12 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
15 int
16 fb_blank(struct fb_info *info, int blank)
17 {
18 - int ret = -EINVAL;
19 + int ret = 0;
20
21 if (blank > FB_BLANK_POWERDOWN)
22 blank = FB_BLANK_POWERDOWN;
23
24 - if (info->fbops->fb_blank)
25 + if (info->fbops->fb_blank && blank == FB_BLANK_UNBLANK)
26 ret = info->fbops->fb_blank(blank, info);
27
28 if (!ret) {
29 @@ -1024,6 +1024,10 @@ fb_blank(struct fb_info *info, int blank)
30 fb_notifier_call_chain(FB_EVENT_BLANK, &event);
31 }
32
33 + if (info->fbops->fb_blank && blank != FB_BLANK_UNBLANK)
34 + ret = info->fbops->fb_blank(blank, info);
35 +
36 +
37 return ret;
38 }
39
40 --
41 1.5.6.5
42