lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] net: intel: e100: Fix warning of passing zero to 'PTR_ERR'
Date
fw could be NULL and put into PTR_ERR
also zero in PTR_ERR will be translated into success return statement

Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com>
---
drivers/net/ethernet/intel/e100.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 4d10270..55e399d 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -1370,7 +1370,9 @@ static inline int e100_load_ucode_wait(struct nic *nic)

fw = e100_request_firmware(nic);
/* If it's NULL, then no ucode is required */
- if (!fw || IS_ERR(fw))
+ if (!fw)
+ return -EINVAL;
+ else if (IS_ERR(fw))
return PTR_ERR(fw);

if ((err = e100_exec_cb(nic, (void *)fw, e100_setup_ucode)))
--
1.9.1
\
 
 \ /
  Last update: 2017-12-07 23:39    [W:0.025 / U:1.548 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site