|
Thomas Bogendoerfer |
58c1f7 |
From: Jason Gunthorpe <jgg@mellanox.com>
|
|
Thomas Bogendoerfer |
58c1f7 |
Date: Tue, 14 Apr 2020 12:27:08 -0300
|
|
Thomas Bogendoerfer |
58c1f7 |
Subject: net/cxgb4: Check the return from t4_query_params properly
|
|
Thomas Bogendoerfer |
58c1f7 |
MIME-Version: 1.0
|
|
Thomas Bogendoerfer |
58c1f7 |
Content-Type: text/plain; charset=UTF-8
|
|
Thomas Bogendoerfer |
58c1f7 |
Content-Transfer-Encoding: 8bit
|
|
Thomas Bogendoerfer |
58c1f7 |
Patch-mainline: v5.7-rc2
|
|
Thomas Bogendoerfer |
58c1f7 |
Git-commit: c799fca8baf18d1bbbbad6c3b736eefbde8bdb90
|
|
Thomas Bogendoerfer |
58c1f7 |
References: git-fixes
|
|
Thomas Bogendoerfer |
58c1f7 |
|
|
Thomas Bogendoerfer |
58c1f7 |
Positive return values are also failures that don't set val,
|
|
Thomas Bogendoerfer |
58c1f7 |
although this probably can't happen. Fixes gcc 10 warning:
|
|
Thomas Bogendoerfer |
58c1f7 |
|
|
Thomas Bogendoerfer |
58c1f7 |
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c: In function ‘t4_phy_fw_ver’:
|
|
Thomas Bogendoerfer |
58c1f7 |
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c:3747:14: warning: ‘val’ may be used uninitialized in this function [-Wmaybe-uninitialized]
|
|
Thomas Bogendoerfer |
58c1f7 |
3747 | *phy_fw_ver = val;
|
|
Thomas Bogendoerfer |
58c1f7 |
|
|
Thomas Bogendoerfer |
58c1f7 |
Fixes: 01b6961410b7 ("cxgb4: Add PHY firmware support for T420-BT cards")
|
|
Thomas Bogendoerfer |
58c1f7 |
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
|
|
Thomas Bogendoerfer |
58c1f7 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Thomas Bogendoerfer |
58c1f7 |
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
|
|
Thomas Bogendoerfer |
58c1f7 |
---
|
|
Thomas Bogendoerfer |
58c1f7 |
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +-
|
|
Thomas Bogendoerfer |
58c1f7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Thomas Bogendoerfer |
58c1f7 |
|
|
Thomas Bogendoerfer |
58c1f7 |
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
|
|
Thomas Bogendoerfer |
58c1f7 |
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
|
|
Thomas Bogendoerfer |
58c1f7 |
@@ -3748,7 +3748,7 @@ int t4_phy_fw_ver(struct adapter *adap,
|
|
Thomas Bogendoerfer |
58c1f7 |
FW_PARAMS_PARAM_Z_V(FW_PARAMS_PARAM_DEV_PHYFW_VERSION));
|
|
Thomas Bogendoerfer |
58c1f7 |
ret = t4_query_params(adap, adap->mbox, adap->pf, 0, 1,
|
|
Thomas Bogendoerfer |
58c1f7 |
¶m, &val;;
|
|
Thomas Bogendoerfer |
58c1f7 |
- if (ret < 0)
|
|
Thomas Bogendoerfer |
58c1f7 |
+ if (ret)
|
|
Thomas Bogendoerfer |
58c1f7 |
return ret;
|
|
Thomas Bogendoerfer |
58c1f7 |
*phy_fw_ver = val;
|
|
Thomas Bogendoerfer |
58c1f7 |
return 0;
|