summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorTiezhu Yang <yangtiezhu@loongson.cn>2025-08-11 15:35:04 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-12-07 06:09:18 +0900
commit157b7b41a5d22d7d61d6998208fc5c7a31831c6f (patch)
tree846f192f2db755e8d35f17fc37620aa501cf65e3 /drivers/net
parentd178723da249eafcd32d4edf26f2cf72c24eebd4 (diff)
downloadlinux-157b7b41a5d22d7d61d6998208fc5c7a31831c6f.tar.gz
linux-157b7b41a5d22d7d61d6998208fc5c7a31831c6f.tar.bz2
linux-157b7b41a5d22d7d61d6998208fc5c7a31831c6f.zip
net: stmmac: Check stmmac_hw_setup() in stmmac_resume()
[ Upstream commit 6896c2449a1858acb643014894d01b3a1223d4e5 ] stmmac_hw_setup() may return 0 on success and an appropriate negative integer as defined in errno.h file on failure, just check it and then return early if failed in stmmac_resume(). Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com> Reviewed-by: Huacai Chen <chenhuacai@loongson.cn> Link: https://patch.msgid.link/20250811073506.27513-2-yangtiezhu@loongson.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 21cc8cd9e023..973c60e01334 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7487,7 +7487,14 @@ int stmmac_resume(struct device *dev)
stmmac_free_tx_skbufs(priv);
stmmac_clear_descriptors(priv);
- stmmac_hw_setup(ndev, false);
+ ret = stmmac_hw_setup(ndev, false);
+ if (ret < 0) {
+ netdev_err(priv->dev, "%s: Hw setup failed\n", __func__);
+ mutex_unlock(&priv->lock);
+ rtnl_unlock();
+ return ret;
+ }
+
stmmac_init_coalesce(priv);
stmmac_set_rx_mode(ndev);