[PATCH] USB: Whiteheat: fix firmware spurious errors

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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index f63c387976cf378a6f8ce78491a3d8de0f9a1c7c..6c8452ede0e113c4c50c6a29620ba7adbb9391db 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/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/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index f806553cd9a4c8929a65b0d3826de27441da5977..3ced09ca11586887f1eb33c76868dd105528eaed 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -388,7 +388,7 @@ static int whiteheat_attach (struct usb_serial *serial)
        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_serial *serial)
        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]) {