diff options
| author | Stuart MacDonald <stuartm@connecttech.com> | 2006-05-31 13:28:40 -0400 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-06-29 17:17:14 -0700 |
| commit | 9baa5f6d7e59d7aecf4c17cc5ac9a162e65e1f72 (patch) | |
| tree | 30bbd9685aa9e515d5da81db13d4b06e9e2f4b86 | |
| parent | 6bd4ccaef717ade827577eacc9df870fbf5e7c46 (diff) | |
| download | lwn-9baa5f6d7e59d7aecf4c17cc5ac9a162e65e1f72.tar.gz lwn-9baa5f6d7e59d7aecf4c17cc5ac9a162e65e1f72.zip | |
[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>
| -rw-r--r-- | drivers/parport/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/whiteheat.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index f63c387976cf..6c8452ede0e1 100644 --- 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 f806553cd9a4..3ced09ca1158 100644 --- 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]) { |