From e6de1ece1f75c0e703d7f0799bc51dee0b32e367 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 16 Dec 2009 15:58:23 -0800 Subject: [PATCH] more .27 patches --- .../backlight-lcd-fix-wrong-sizeof.patch | 31 +++++++++++++ ...-bug-with-symlink-garbage-collection.patch | 33 ++++++++++++++ ...-fix-problems-with-display-stability.patch | 45 +++++++++++++++++++ queue-2.6.27/series | 3 ++ 4 files changed, 112 insertions(+) create mode 100644 queue-2.6.27/backlight-lcd-fix-wrong-sizeof.patch create mode 100644 queue-2.6.27/jffs2-fix-long-standing-bug-with-symlink-garbage-collection.patch create mode 100644 queue-2.6.27/matroxfb-fix-problems-with-display-stability.patch diff --git a/queue-2.6.27/backlight-lcd-fix-wrong-sizeof.patch b/queue-2.6.27/backlight-lcd-fix-wrong-sizeof.patch new file mode 100644 index 00000000000..1530e66171d --- /dev/null +++ b/queue-2.6.27/backlight-lcd-fix-wrong-sizeof.patch @@ -0,0 +1,31 @@ +From 1e0fa6bd8c7468067f2e988c7a416dafd0651c34 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 2 Oct 2009 11:28:18 +0200 +Subject: backlight: lcd - Fix wrong sizeof + +From: Jean Delvare + +commit 1e0fa6bd8c7468067f2e988c7a416dafd0651c34 upstream. + +Which is why I have always preferred sizeof(struct foo) over +sizeof(var). + +Signed-off-by: Jean Delvare +Signed-off-by: Richard Purdie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/backlight/lcd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/backlight/lcd.c ++++ b/drivers/video/backlight/lcd.c +@@ -41,7 +41,7 @@ static int fb_notifier_callback(struct n + + static int lcd_register_fb(struct lcd_device *ld) + { +- memset(&ld->fb_notif, 0, sizeof(&ld->fb_notif)); ++ memset(&ld->fb_notif, 0, sizeof(ld->fb_notif)); + ld->fb_notif.notifier_call = fb_notifier_callback; + return fb_register_client(&ld->fb_notif); + } diff --git a/queue-2.6.27/jffs2-fix-long-standing-bug-with-symlink-garbage-collection.patch b/queue-2.6.27/jffs2-fix-long-standing-bug-with-symlink-garbage-collection.patch new file mode 100644 index 00000000000..2fc227574d3 --- /dev/null +++ b/queue-2.6.27/jffs2-fix-long-standing-bug-with-symlink-garbage-collection.patch @@ -0,0 +1,33 @@ +From 2e16cfca6e17ae37ae21feca080a6f2eca9087dc Mon Sep 17 00:00:00 2001 +From: David Woodhouse +Date: Wed, 16 Dec 2009 03:27:20 +0000 +Subject: jffs2: Fix long-standing bug with symlink garbage collection. + +From: David Woodhouse + +commit 2e16cfca6e17ae37ae21feca080a6f2eca9087dc upstream. + +Ever since jffs2_garbage_collect_metadata() was first half-written in +February 2001, it's been broken on architectures where 'char' is signed. +When garbage collecting a symlink with target length above 127, the payload +length would end up negative, causing interesting and bad things to happen. + +Signed-off-by: David Woodhouse +Signed-off-by: Greg Kroah-Hartman + +--- + fs/jffs2/gc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/jffs2/gc.c ++++ b/fs/jffs2/gc.c +@@ -700,7 +700,8 @@ static int jffs2_garbage_collect_metadat + struct jffs2_raw_inode ri; + struct jffs2_node_frag *last_frag; + union jffs2_device_node dev; +- char *mdata = NULL, mdatalen = 0; ++ char *mdata = NULL; ++ int mdatalen = 0; + uint32_t alloclen, ilen; + int ret; + diff --git a/queue-2.6.27/matroxfb-fix-problems-with-display-stability.patch b/queue-2.6.27/matroxfb-fix-problems-with-display-stability.patch new file mode 100644 index 00000000000..559af1a6250 --- /dev/null +++ b/queue-2.6.27/matroxfb-fix-problems-with-display-stability.patch @@ -0,0 +1,45 @@ +From 8c651311a3a08c1e4815de6933e00a760e498dae Mon Sep 17 00:00:00 2001 +From: Alan Cox +Date: Tue, 15 Dec 2009 16:46:40 -0800 +Subject: matroxfb: fix problems with display stability + +From: Alan Cox + +commit 8c651311a3a08c1e4815de6933e00a760e498dae upstream. + +Regression caused in 2.6.23 and then despite repeated requests never fixed +or dealt with (Petr promised to sort it in 2008 but seems to have +forgotten). + +Enough is enough - remove the problem line that was added. If it upsets +someone they've had two years to deal with it and at the very least it'll +rattle their cage and wake them up. + +Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9709 + +Signed-off-by: Alan Cox +Reported-by: Damon +Tested-by: Ruud van Melick +Cc: Petr Vandrovec +Cc: Pekka Enberg +Cc: Paul A. Clarke +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/matrox/g450_pll.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/video/matrox/g450_pll.c ++++ b/drivers/video/matrox/g450_pll.c +@@ -341,7 +341,8 @@ static int __g450_setclk(WPMINFO unsigne + M1064_XDVICLKCTRL_C1DVICLKEN | + M1064_XDVICLKCTRL_DVILOOPCTL | + M1064_XDVICLKCTRL_P1LOOPBWDTCTL; +- matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL,tmp); ++ /* Setting this breaks PC systems so don't do it */ ++ /* matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL,tmp); */ + matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, + xpwrctrl); + diff --git a/queue-2.6.27/series b/queue-2.6.27/series index 7fb5f28766e..603aa7143ff 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -13,3 +13,6 @@ x86-fix-iommu-nodac-parameter-handling.patch x86-gart-pci-gart_64.c-use-correct-length-in-strncmp.patch fix-csum_ipv6_magic.patch usb-fix-mos7840-problem-with-minor-numbers.patch +backlight-lcd-fix-wrong-sizeof.patch +jffs2-fix-long-standing-bug-with-symlink-garbage-collection.patch +matroxfb-fix-problems-with-display-stability.patch -- 2.47.2