From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 239832750E6; Tue, 11 Nov 2025 01:10:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762823400; cv=none; b=mkPoUQN+UjCwLYY/lp08w33fSqbstlxVZ3poOWlzkqLTczwffr6x2VXRJjl/2taMXSK+k7GrSyImZAKNCdCc3/nboTk3jH3D6t00WKl0wKNdjemGnv0NPiwBrqlubDb4nqm5iduxXkVYY2195ziQYwsSG71axcs9COt2MN09pbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762823400; c=relaxed/simple; bh=6ZqC98vG/lvvPHQxd0BcoKc8VaN3ogMTBgvbsdup0fo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pqs+SUHprlI1DoZ7aPEM/4A6ua1nSxjXf48cLkPENgytRRUHzJhdQY5FYSvAOgxliW+rYzHZvh6vVE8h8R3WaY0JItz8tP42OVOcpK7LbX3EqMnSCkeZZ65bie0aRDNQ9P2mXA44fWVMNu8w8gLW8YkLp3zQDX4tXWh1Wd12dm0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KcaVvvZw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KcaVvvZw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BADDC116B1; Tue, 11 Nov 2025 01:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1762823399; bh=6ZqC98vG/lvvPHQxd0BcoKc8VaN3ogMTBgvbsdup0fo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KcaVvvZwVSS89MVhDbdEFuFQA433KytinWdJ6xbKAtNzh4YYqCL63vykErk3RRBkL 6cm3rMa1A21UXsYLvVq299Iv3reuggL9H02sLAmJ1IEIHLbIihzQmPlHKzaDCl8LxL YVLvRDMcaPEJXF7LtBiWDjWTSpdkj1DyURjfeeSM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tiezhu Yang , Maxime Chevallier , Huacai Chen , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.17 293/849] net: stmmac: Check stmmac_hw_setup() in stmmac_resume() Date: Tue, 11 Nov 2025 09:37:43 +0900 Message-ID: <20251111004543.490932570@linuxfoundation.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251111004536.460310036@linuxfoundation.org> References: <20251111004536.460310036@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tiezhu Yang [ 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 Reviewed-by: Maxime Chevallier Reviewed-by: Huacai Chen Link: https://patch.msgid.link/20250811073506.27513-2-yangtiezhu@loongson.cn Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 7b16d1207b80c..b9f55e4e360fb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7977,7 +7977,14 @@ int stmmac_resume(struct device *dev) stmmac_free_tx_skbufs(priv); stmmac_clear_descriptors(priv, &priv->dma_conf); - 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); phylink_rx_clk_stop_block(priv->phylink); stmmac_set_rx_mode(ndev); -- 2.51.0