* [patch 1/2] netxen: fix error handling in netxen_get_flash_block()
@ 2016-05-05 13:18 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2016-05-05 13:18 UTC (permalink / raw)
To: Manish Chopra
Cc: Sony Chacko, Rajesh Borundia, netdev, linux-kernel, kernel-janitors
My static checker complained that "v" can be used unintialized if
netxen_rom_fast_read() returns -EIO. That function never actually
returns -1.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index db80eb1..a320541 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -1015,20 +1015,24 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
{
int i, v, addr;
__le32 *ptr32;
+ int ret;
addr = base;
ptr32 = buf;
for (i = 0; i < size / sizeof(u32); i++) {
- if (netxen_rom_fast_read(adapter, addr, &v) == -1)
- return -1;
+ ret = netxen_rom_fast_read(adapter, addr, &v);
+ if (ret)
+ return ret;
+
*ptr32 = cpu_to_le32(v);
ptr32++;
addr += sizeof(u32);
}
if ((char *)buf + size > (char *)ptr32) {
__le32 local;
- if (netxen_rom_fast_read(adapter, addr, &v) == -1)
- return -1;
+ ret = netxen_rom_fast_read(adapter, addr, &v);
+ if (ret)
+ return ret;
local = cpu_to_le32(v);
memcpy(ptr32, &local, (char *)buf + size - (char *)ptr32);
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [patch 1/2] netxen: fix error handling in netxen_get_flash_block()
@ 2016-05-05 13:18 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2016-05-05 13:18 UTC (permalink / raw)
To: Manish Chopra
Cc: Sony Chacko, Rajesh Borundia, netdev, linux-kernel, kernel-janitors
My static checker complained that "v" can be used unintialized if
netxen_rom_fast_read() returns -EIO. That function never actually
returns -1.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index db80eb1..a320541 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -1015,20 +1015,24 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
{
int i, v, addr;
__le32 *ptr32;
+ int ret;
addr = base;
ptr32 = buf;
for (i = 0; i < size / sizeof(u32); i++) {
- if (netxen_rom_fast_read(adapter, addr, &v) = -1)
- return -1;
+ ret = netxen_rom_fast_read(adapter, addr, &v);
+ if (ret)
+ return ret;
+
*ptr32 = cpu_to_le32(v);
ptr32++;
addr += sizeof(u32);
}
if ((char *)buf + size > (char *)ptr32) {
__le32 local;
- if (netxen_rom_fast_read(adapter, addr, &v) = -1)
- return -1;
+ ret = netxen_rom_fast_read(adapter, addr, &v);
+ if (ret)
+ return ret;
local = cpu_to_le32(v);
memcpy(ptr32, &local, (char *)buf + size - (char *)ptr32);
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch 1/2] netxen: fix error handling in netxen_get_flash_block()
2016-05-05 13:18 ` Dan Carpenter
@ 2016-05-07 19:16 ` David Miller
-1 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2016-05-07 19:16 UTC (permalink / raw)
To: dan.carpenter
Cc: manish.chopra, sony.chacko, rajesh.borundia, netdev,
linux-kernel, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 5 May 2016 16:18:46 +0300
> My static checker complained that "v" can be used unintialized if
> netxen_rom_fast_read() returns -EIO. That function never actually
> returns -1.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 1/2] netxen: fix error handling in netxen_get_flash_block()
@ 2016-05-07 19:16 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2016-05-07 19:16 UTC (permalink / raw)
To: dan.carpenter
Cc: manish.chopra, sony.chacko, rajesh.borundia, netdev,
linux-kernel, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 5 May 2016 16:18:46 +0300
> My static checker complained that "v" can be used unintialized if
> netxen_rom_fast_read() returns -EIO. That function never actually
> returns -1.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-07 19:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-05 13:18 [patch 1/2] netxen: fix error handling in netxen_get_flash_block() Dan Carpenter
2016-05-05 13:18 ` Dan Carpenter
2016-05-07 19:16 ` David Miller
2016-05-07 19:16 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.