vxge: correct eprom version detection
authorJon Mason <jon.mason@exar.com>
Tue, 18 Jan 2011 15:02:20 +0000 (15:02 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Jan 2011 07:18:13 +0000 (23:18 -0800)
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: Jon Mason <jon.mason@exar.com>
Signed-off-by: Sivakumar Subramani <sivakumar.subramani@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vxge/vxge-config.c
drivers/net/vxge/vxge-main.c

index 01c05f53e2f916df02a642843077a76cf7208a96..da35562ba48c4ae18aec3ef62135f9fc94e52a0e 100644 (file)
@@ -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;
index ecf9a8ee6838f1eed3c67865bc9b7337707dfc64..0fcac099413a3d72c8babc2b6309a6edab81cdd0 100644 (file)
@@ -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),