[patch] netxen: netxen_rom_fast_read() doesn't return -1

Subsystems: networking drivers, netxen (1/10) gbe support, the rest

STALE3754d

2 messages, 2 authors, 2016-05-07 · open the first message on its own page

[patch] netxen: netxen_rom_fast_read() doesn't return -1

From: Dan Carpenter <hidden>
Date: 2016-05-05 13:20:44

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 <redacted>
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index fd362b6..9c6eed9 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -852,7 +852,8 @@ netxen_check_options(struct netxen_adapter *adapter)
 	ptr32 = (__le32 *)&serial_num;
 	offset = NX_FW_SERIAL_NUM_OFFSET;
 	for (i = 0; i < 8; i++) {
-		if (netxen_rom_fast_read(adapter, offset, &val) == -1) {
+		err = netxen_rom_fast_read(adapter, offset, &val);
+		if (err) {
 			dev_err(&pdev->dev, "error reading board info\n");
 			adapter->driver_mismatch = 1;
 			return;

Re: [patch] netxen: netxen_rom_fast_read() doesn't return -1

From: David Miller <davem@davemloft.net>
Date: 2016-05-07 19:16:30

From: Dan Carpenter <redacted>
Date: Thu, 5 May 2016 16:20:20 +0300
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 <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help