| From 271c1150b4f8e1685e5a8cbf76e329ec894481da Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no> |
| Date: Mon, 17 Jan 2011 14:19:37 +0100 |
| Subject: USB: io_edgeport: fix the reported firmware major and minor |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Bjørn Mork <bjorn@mork.no> |
| |
| commit 271c1150b4f8e1685e5a8cbf76e329ec894481da upstream. |
| |
| The major and minor number saved in the product_info structure |
| were copied from the address instead of the data, causing an |
| inconsistency in the reported versions during firmware loading: |
| |
| usb 4-1: firmware: requesting edgeport/down.fw |
| /usr/src/linux/drivers/usb/serial/io_edgeport.c: downloading firmware version (930) 1.16.4 |
| [..] |
| /usr/src/linux/drivers/usb/serial/io_edgeport.c: edge_startup - time 3 4328191260 |
| /usr/src/linux/drivers/usb/serial/io_edgeport.c: FirmwareMajorVersion 0.0.4 |
| |
| This can cause some confusion whether firmware loaded successfully |
| or not. |
| |
| Signed-off-by: Bjørn Mork <bjorn@mork.no> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/usb/serial/io_edgeport.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/serial/io_edgeport.c |
| +++ b/drivers/usb/serial/io_edgeport.c |
| @@ -2935,8 +2935,8 @@ static void load_application_firmware(st |
| |
| dbg("%s %d.%d.%d", fw_info, rec->data[0], rec->data[1], build); |
| |
| - edge_serial->product_info.FirmwareMajorVersion = fw->data[0]; |
| - edge_serial->product_info.FirmwareMinorVersion = fw->data[1]; |
| + edge_serial->product_info.FirmwareMajorVersion = rec->data[0]; |
| + edge_serial->product_info.FirmwareMinorVersion = rec->data[1]; |
| edge_serial->product_info.FirmwareBuildNumber = cpu_to_le16(build); |
| |
| for (rec = ihex_next_binrec(rec); rec; |