aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vxge
diff options
context:
space:
mode:
authorJon Mason <jon.mason@exar.com>2011-01-18 10:02:20 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-20 02:18:13 -0500
commit1d15f81cda496f1c1d59af7458ea0bcdeeb726f3 (patch)
tree7e7cd91267b9e2a7f83d93611d481182da060df5 /drivers/net/vxge
parent6cca200362b46a6845b3f07367f5068a427161e1 (diff)
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: Jon Mason <jon.mason@exar.com> Signed-off-by: Sivakumar Subramani <sivakumar.subramani@exar.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge')
-rw-r--r--drivers/net/vxge/vxge-config.c2
-rw-r--r--drivers/net/vxge/vxge-main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 01c05f53e2f9..da35562ba48c 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -387,8 +387,8 @@ vxge_hw_vpath_eprom_img_ver_get(struct __vxge_hw_device *hldev,
387 data1 = steer_ctrl = 0; 387 data1 = steer_ctrl = 0;
388 388
389 status = vxge_hw_vpath_fw_api(vpath, 389 status = vxge_hw_vpath_fw_api(vpath,
390 VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
391 VXGE_HW_FW_API_GET_EPROM_REV, 390 VXGE_HW_FW_API_GET_EPROM_REV,
391 VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
392 0, &data0, &data1, &steer_ctrl); 392 0, &data0, &data1, &steer_ctrl);
393 if (status != VXGE_HW_OK) 393 if (status != VXGE_HW_OK)
394 break; 394 break;
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index ecf9a8ee6838..0fcac099413a 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -4451,7 +4451,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
4451 if (!img[i].is_valid) 4451 if (!img[i].is_valid)
4452 break; 4452 break;
4453 vxge_debug_init(VXGE_TRACE, "%s: EPROM %d, version " 4453 vxge_debug_init(VXGE_TRACE, "%s: EPROM %d, version "
4454 "%d.%d.%d.%d\n", VXGE_DRIVER_NAME, i, 4454 "%d.%d.%d.%d", VXGE_DRIVER_NAME, i,
4455 VXGE_EPROM_IMG_MAJOR(img[i].version), 4455 VXGE_EPROM_IMG_MAJOR(img[i].version),
4456 VXGE_EPROM_IMG_MINOR(img[i].version), 4456 VXGE_EPROM_IMG_MINOR(img[i].version),
4457 VXGE_EPROM_IMG_FIX(img[i].version), 4457 VXGE_EPROM_IMG_FIX(img[i].version),