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

Commit 1d15f81c authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

vxge: correct eprom version detection 



The firmware PXE EPROM version detection is failing due to passing the
wrong parameter into firmware query function.  Also, the version
printing function has an extraneous newline.

Signed-off-by: default avatarJon Mason <jon.mason@exar.com>
Signed-off-by: default avatarSivakumar Subramani <sivakumar.subramani@exar.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cca2003

drivers/net/vxge/vxge-config.c

+1 −1
Original line number Diff line number Diff line
@@ -387,8 +387,8 @@ vxge_hw_vpath_eprom_img_ver_get(struct __vxge_hw_device *hldev, 
		data1 = steer_ctrl = 0;



		status = vxge_hw_vpath_fw_api(vpath,

			VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,

			VXGE_HW_FW_API_GET_EPROM_REV,

			VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,

			0, &data0, &data1, &steer_ctrl);

		if (status != VXGE_HW_OK)

			break;

drivers/net/vxge/vxge-main.c

+1 −1
Original line number Diff line number Diff line
@@ -4451,7 +4451,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) 
			if (!img[i].is_valid)

				break;

			vxge_debug_init(VXGE_TRACE, "%s: EPROM %d, version "

					"%d.%d.%d.%d\n", VXGE_DRIVER_NAME, i,

					"%d.%d.%d.%d", VXGE_DRIVER_NAME, i,

					VXGE_EPROM_IMG_MAJOR(img[i].version),

					VXGE_EPROM_IMG_MINOR(img[i].version),

					VXGE_EPROM_IMG_FIX(img[i].version),