Skip to content

Commit 8c1f454

Browse files
Dan Carpenterdavem330
authored andcommitted
netxen: netxen_rom_fast_read() doesn't return -1
The error handling is broken here. netxen_rom_fast_read() returns zero on success and -EIO on error. It never returns -1. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1c755ff commit 8c1f454

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,8 @@ netxen_check_options(struct netxen_adapter *adapter)
852852
ptr32 = (__le32 *)&serial_num;
853853
offset = NX_FW_SERIAL_NUM_OFFSET;
854854
for (i = 0; i < 8; i++) {
855-
if (netxen_rom_fast_read(adapter, offset, &val) == -1) {
855+
err = netxen_rom_fast_read(adapter, offset, &val);
856+
if (err) {
856857
dev_err(&pdev->dev, "error reading board info\n");
857858
adapter->driver_mismatch = 1;
858859
return;

0 commit comments

Comments
 (0)