diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-11 04:44:45 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-11 04:44:45 +0000 |
| commit | 4a18a35a91f6650deea92052c9fb74c1b90d7428 (patch) | |
| tree | 9f8851bc32dbcd5a39bcb13ecf294dff3902aeab /target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch | |
| parent | 2710572b04ad8ad7b1e100083efbec70f8b61007 (diff) | |
| download | upstream-4a18a35a91f6650deea92052c9fb74c1b90d7428.tar.gz upstream-4a18a35a91f6650deea92052c9fb74c1b90d7428.tar.bz2 upstream-4a18a35a91f6650deea92052c9fb74c1b90d7428.zip | |
Merge xburst target.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19098 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch')
| -rw-r--r-- | target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch b/target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch new file mode 100644 index 0000000000..43277062dc --- /dev/null +++ b/target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch @@ -0,0 +1,42 @@ +From 2d00c901d3a438c6f750f8b13b329845775ec3b5 Mon Sep 17 00:00:00 2001 +From: Lars-Peter Clausen <lars@metafoo.de> +Date: Mon, 11 Jan 2010 04:29:50 +0100 +Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/420-fb-notifier-pre-post.patch + +--- + 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 99bbd28..5e121b8 100644 +--- a/drivers/video/fbmem.c ++++ b/drivers/video/fbmem.c +@@ -1008,12 +1008,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) { +@@ -1024,6 +1024,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.5.6.5 + |