From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 19 Jun 2006 20:15:36 +0000 (-0700)
Subject: add some 2.6.17 patches
X-Git-Tag: v2.6.16.21~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00153d262df830c8116d4bf578002232e97a419d;p=thirdparty%2Fkernel%2Fstable-queue.git

add some 2.6.17 patches
---

diff --git a/queue-2.6.17/serial-parport_serial-should-depend-on-serial_8250_pci.patch b/queue-2.6.17/serial-parport_serial-should-depend-on-serial_8250_pci.patch
new file mode 100644
index 00000000000..0cf9e2a0168
--- /dev/null
+++ b/queue-2.6.17/serial-parport_serial-should-depend-on-serial_8250_pci.patch
@@ -0,0 +1,28 @@
+Date:	Sun, 18 Jun 2006 13:05:43 +0100
+From:	Russell King <rmk+lkml@arm.linux.org.uk>
+To:	Andrey Borzenkov <arvidjaar@mail.ru>
+Subject: SERIAL: PARPORT_SERIAL should depend on SERIAL_8250_PCI
+
+Since parport_serial uses symbols from 8250_pci, there should
+be a dependency between the configuration symbols for these
+two modules.  Problem reported by Andrey Borzenkov
+
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+
+ drivers/parport/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.17.orig/drivers/parport/Kconfig
++++ linux-2.6.17/drivers/parport/Kconfig
+@@ -48,7 +48,7 @@ config PARPORT_PC
+ 
+ config PARPORT_SERIAL
+ 	tristate "Multi-IO cards (parallel and serial)"
+-	depends on SERIAL_8250 && PARPORT_PC && PCI
++	depends on SERIAL_8250_PCI && PARPORT_PC && PCI
+ 	help
+ 	  This adds support for multi-IO PCI cards that have parallel and
+ 	  serial ports.  You should say Y or M here.  If you say M, the module
diff --git a/queue-2.6.17/series b/queue-2.6.17/series
new file mode 100644
index 00000000000..18951cdb999
--- /dev/null
+++ b/queue-2.6.17/series
@@ -0,0 +1,2 @@
+usb-whiteheat-fix-firmware-spurious-errors.patch
+serial-parport_serial-should-depend-on-serial_8250_pci.patch
diff --git a/queue-2.6.17/usb-whiteheat-fix-firmware-spurious-errors.patch b/queue-2.6.17/usb-whiteheat-fix-firmware-spurious-errors.patch
new file mode 100644
index 00000000000..26b20035600
--- /dev/null
+++ b/queue-2.6.17/usb-whiteheat-fix-firmware-spurious-errors.patch
@@ -0,0 +1,37 @@
+From stuartm@connecttech.com Wed May 31 10:40:58 2006
+From: "Stuart MacDonald" <stuartm@connecttech.com>
+To: <greg@kroah.com>
+Subject: USB: Whiteheat: fix firmware spurious errors
+Date: Wed, 31 May 2006 13:28:40 -0400
+Message-ID: <02d901c684d7$a87b8460$294b82ce@stuartm>
+
+Attached patch fixes spurious errors during firmware load.
+
+Signed-off-by: Stuart MacDonald <stuartm@connecttech.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/usb/serial/whiteheat.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.17.orig/drivers/usb/serial/whiteheat.c
++++ linux-2.6.17/drivers/usb/serial/whiteheat.c
+@@ -388,7 +388,7 @@ static int whiteheat_attach (struct usb_
+ 	if (ret) {
+ 		err("%s: Couldn't send command [%d]", serial->type->description, ret);
+ 		goto no_firmware;
+-	} else if (alen != sizeof(command)) {
++	} else if (alen != 2) {
+ 		err("%s: Send command incomplete [%d]", serial->type->description, alen);
+ 		goto no_firmware;
+ 	}
+@@ -400,7 +400,7 @@ static int whiteheat_attach (struct usb_
+ 	if (ret) {
+ 		err("%s: Couldn't get results [%d]", serial->type->description, ret);
+ 		goto no_firmware;
+-	} else if (alen != sizeof(result)) {
++	} else if (alen != sizeof(*hw_info) + 1) {
+ 		err("%s: Get results incomplete [%d]", serial->type->description, alen);
+ 		goto no_firmware;
+ 	} else if (result[0] != command[0]) {