Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271c1150 authored by Bjørn Mork's avatar Bjørn Mork Committed by Greg Kroah-Hartman
Browse files

USB: io_edgeport: fix the reported firmware major and minor 



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.

Cc: stable@kernel.org
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ebf53826

drivers/usb/serial/io_edgeport.c

+2 −2
Original line number Diff line number Diff line
@@ -2889,8 +2889,8 @@ static void load_application_firmware(struct edgeport_serial *edge_serial) 


	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;