From cd0d465bb697a9c7bf66a9fe940f7981232f1676 Mon Sep 17 00:00:00 2001

From: YueHaibing <yuehaibing@huawei.com>

Date: Mon, 19 Nov 2018 20:48:19 +0800

Subject: [PATCH] e100: Fix passing zero to 'PTR_ERR' warning in e100_load_ucode_wait

Git-commit: cd0d465bb697a9c7bf66a9fe940f7981232f1676

Patch-mainline: v5.0-rc1

References: bsc#1051510

Fix a static code checker warning:

drivers/net/ethernet/intel/e100.c:1349

 e100_load_ucode_wait() warn: passing zero to 'PTR_ERR'

Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/ethernet/intel/e100.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c

index 5e5c57db0d3f..0fd268070fb4 100644

--- a/drivers/net/ethernet/intel/e100.c

+++ b/drivers/net/ethernet/intel/e100.c

@@ -1345,8 +1345,8 @@ 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))

-		return PTR_ERR(fw);

+	if (IS_ERR_OR_NULL(fw))

+		return PTR_ERR_OR_ZERO(fw);

 	if ((err = e100_exec_cb(nic, (void *)fw, e100_setup_ucode)))

 		netif_err(nic, probe, nic->netdev,

-- 

2.16.4