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

From	Dan Carpenter <dan.carpenter@oracle.com>
Newsgroups	linux.kernel
Subject	[patch] netxen: netxen_rom_fast_read() doesn't return -1
Date	2016-05-05 15:30 +0200
Message-ID	<rvrvS-MH-49@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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 <dan.carpenter@oracle.com>

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;

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[patch] netxen: netxen_rom_fast_read() doesn't return -1 Dan Carpenter <dan.carpenter@oracle.com> - 2016-05-05 15:30 +0200
  Re: [patch] netxen: netxen_rom_fast_read() doesn't return -1 David Miller <davem@davemloft.net> - 2016-05-07 21:20 +0200

csiph-web