From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 2 Jun 2006 22:02:03 +0000 (-0700)
Subject: another patch added to the queue
X-Git-Tag: v2.6.16.20~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68138417fb503f37384909e10b04a8aa78f9ba0c;p=thirdparty%2Fkernel%2Fstable-queue.git

another patch added to the queue
---

diff --git a/queue-2.6.16/stable b/queue-2.6.16/stable
new file mode 100644
index 00000000000..507b183da17
--- /dev/null
+++ b/queue-2.6.16/stable
@@ -0,0 +1 @@
+usb-whiteheat-fix-firmware-spurious-errors.patch
diff --git a/queue-2.6.16/usb-whiteheat-fix-firmware-spurious-errors.patch b/queue-2.6.16/usb-whiteheat-fix-firmware-spurious-errors.patch
new file mode 100644
index 00000000000..90aed9df233
--- /dev/null
+++ b/queue-2.6.16/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(-)
+
+--- gregkh-2.6.orig/drivers/usb/serial/whiteheat.c
++++ gregkh-2.6/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]) {