From: Greg Kroah-Hartman Date: Mon, 29 Jun 2009 19:04:42 +0000 (-0700) Subject: .29 patches X-Git-Tag: v2.6.27.26~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=641939abf7fc6426af5462a7d378ae7a3839bdad;p=thirdparty%2Fkernel%2Fstable-queue.git .29 patches --- diff --git a/queue-2.6.29/atmel_lcdfb-correct-fifo-size-for-some-products.patch b/queue-2.6.29/atmel_lcdfb-correct-fifo-size-for-some-products.patch new file mode 100644 index 00000000000..85c8365592e --- /dev/null +++ b/queue-2.6.29/atmel_lcdfb-correct-fifo-size-for-some-products.patch @@ -0,0 +1,45 @@ +From 53b7479bbdaedcc7846c66fd608fe66f1b5aa35b Mon Sep 17 00:00:00 2001 +From: Nicolas Ferre +Date: Thu, 28 May 2009 14:34:36 -0700 +Subject: atmel_lcdfb: correct fifo size for some products + +From: Nicolas Ferre + +commit 53b7479bbdaedcc7846c66fd608fe66f1b5aa35b upstream. + +Remove wrong fifo size definition for some AT91 products. + +Due to a misunderstanding of some AT91 datasheets, a fifo size of 2048 +(words) has been introduced by mistake. In fact, all products (AT91/AT32) +are sharing the same fifo size of 512 words. + +Signed-off-by: Nicolas Ferre +Cc: Andrew Victor +Acked-by: Haavard Skinnemoen +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/atmel_lcdfb.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +--- a/drivers/video/atmel_lcdfb.c ++++ b/drivers/video/atmel_lcdfb.c +@@ -29,14 +29,8 @@ + + /* configurable parameters */ + #define ATMEL_LCDC_CVAL_DEFAULT 0xc8 +-#define ATMEL_LCDC_DMA_BURST_LEN 8 +- +-#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9) || \ +- defined(CONFIG_ARCH_AT91SAM9RL) +-#define ATMEL_LCDC_FIFO_SIZE 2048 +-#else +-#define ATMEL_LCDC_FIFO_SIZE 512 +-#endif ++#define ATMEL_LCDC_DMA_BURST_LEN 8 /* words */ ++#define ATMEL_LCDC_FIFO_SIZE 512 /* words */ + + #if defined(CONFIG_ARCH_AT91) + #define ATMEL_LCDFB_FBINFO_DEFAULT (FBINFO_DEFAULT \ diff --git a/queue-2.6.29/bonding-fix-multiple-module-load-problem.patch b/queue-2.6.29/bonding-fix-multiple-module-load-problem.patch new file mode 100644 index 00000000000..c4add12f148 --- /dev/null +++ b/queue-2.6.29/bonding-fix-multiple-module-load-problem.patch @@ -0,0 +1,41 @@ +From b09a48a3f84cc28dea31822db22fcbcd14e68aef Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger +Date: Thu, 11 Jun 2009 05:46:04 -0700 +Subject: bonding: fix multiple module load problem + +From: Stephen Hemminger + +[ Upstream commit 130aa61a77b8518f1ea618e1b7d214d60b405f10 ] + +Some users still load bond module multiple times to create bonding +devices. This accidentally was broken by a later patch about +the time sysfs was fixed. According to Jay, it was broken +by: + commit b8a9787eddb0e4665f31dd1d64584732b2b5d051 + Author: Jay Vosburgh + Date: Fri Jun 13 18:12:04 2008 -0700 + + bonding: Allow setting max_bonds to zero + +Note: sysfs and procfs still produce WARN() messages when this is done +so the sysfs method is the recommended API. + +Signed-off-by: Stephen Hemminger +Signed-off-by: Jay Vosburgh +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/bonding/bond_sysfs.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/bonding/bond_sysfs.c ++++ b/drivers/net/bonding/bond_sysfs.c +@@ -1538,6 +1538,7 @@ int bond_create_sysfs(void) + printk(KERN_ERR + "network device named %s already exists in sysfs", + class_attr_bonding_masters.attr.name); ++ ret = 0; + } + + return ret; diff --git a/queue-2.6.29/char-moxa-prevent-opening-unavailable-ports.patch b/queue-2.6.29/char-moxa-prevent-opening-unavailable-ports.patch new file mode 100644 index 00000000000..dcc25bf2e2b --- /dev/null +++ b/queue-2.6.29/char-moxa-prevent-opening-unavailable-ports.patch @@ -0,0 +1,51 @@ +From a90b037583d5f1ae3e54e9c687c79df82d1d34a4 Mon Sep 17 00:00:00 2001 +From: Dirk Eibach +Date: Thu, 18 Jun 2009 16:49:15 -0700 +Subject: char: moxa, prevent opening unavailable ports + +From: Dirk Eibach + +commit a90b037583d5f1ae3e54e9c687c79df82d1d34a4 upstream. + +In moxa.c there are 32 minor numbers reserved for each device. The number +of ports actually available per device is stored in +moxa_board_conf->numPorts. This number is not considered in moxa_open(). +Opening a port that is not available results in a kernel oops. This patch +adds a test to moxa_open() that prevents opening unavailable ports. + +[akpm@linux-foundation.org: avoid multiple returns] +Signed-off-by: Dirk Eibach +Signed-off-by: Jiri Slaby +Cc: Alan Cox +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/moxa.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/char/moxa.c ++++ b/drivers/char/moxa.c +@@ -1184,6 +1184,11 @@ static int moxa_open(struct tty_struct * + return -ENODEV; + } + ++ if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) { ++ retval = -ENODEV; ++ goto out_unlock; ++ } ++ + ch = &brd->ports[port % MAX_PORTS_PER_BOARD]; + ch->port.count++; + tty->driver_data = ch; +@@ -1208,8 +1213,8 @@ static int moxa_open(struct tty_struct * + moxa_close_port(tty); + } else + ch->port.flags |= ASYNC_NORMAL_ACTIVE; ++out_unlock: + mutex_unlock(&moxa_openlock); +- + return retval; + } + diff --git a/queue-2.6.29/series b/queue-2.6.29/series index 319d4ab896c..94947aa8092 100644 --- a/queue-2.6.29/series +++ b/queue-2.6.29/series @@ -7,3 +7,6 @@ fs-remove-incorrect-i_new-warnings.patch firmware_map-fix-hang-with-x86-32bit.patch pci-disable-aspm-on-via-root-port-under-bridge-configurations.patch atkbd-add-forced-release-quirks-for-four-more-keyboard-models.patch +atmel_lcdfb-correct-fifo-size-for-some-products.patch +bonding-fix-multiple-module-load-problem.patch +char-moxa-prevent-opening-unavailable-ports.patch