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 F348530F535; Wed, 3 Dec 2025 15:34:50 +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=1764776091; cv=none; b=Wgj+saYP3DpXEjzhPuUzlkR73FhiheSRSKBkgzOzDiM41Fta+VRxgN5BpRRjvEEdNjpKmiV9IyhuBV2c9GA1qPK13ghykKd04ccoC4xKzPdyJh4Nsk/SKfpDa776SZkpYMyZ5rgCok6ClnGwLHBRETzOs+FZ/JHivHcqqkWEiO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764776091; c=relaxed/simple; bh=ibqH2NtZDA6cL7Rycm7psrmLqF2SrtWvnVvNdSGms8Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qqQe1FvyG5zGn6qbopwZgJTDZdZDcuPoUE0JpEiTztCabTZ6d8smm6gqowB1gFz9kzuinGxT7mT0vpxV5ffm5o1j5w9w/amenqaiOQfcE7Kth7kkvds6/Ko2Km1H0yJDPOc7Xm8Y3mP37/vtl5c38xjNqrs7HENdfCblay32a0I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BZ3JKJvy; 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="BZ3JKJvy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8F25C4CEF5; Wed, 3 Dec 2025 15:34:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764776090; bh=ibqH2NtZDA6cL7Rycm7psrmLqF2SrtWvnVvNdSGms8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BZ3JKJvyuqiUww0UyShvZd2KU7CV13FQwC7IGEy9zE6SycWLyJcxCkF3VNKtrIqDB IFqdoUUSW1f/asmr/rg4CPELm8NDNs0dAsV489EjZW+FzyKajTVkrfMHrNnvb2TRtz q0Zu1oUafOwwgcTWkhyQiIsgZSRwc6n5b/s9DgXg= 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 5.10 078/300] net: stmmac: Check stmmac_hw_setup() in stmmac_resume() Date: Wed, 3 Dec 2025 16:24:42 +0100 Message-ID: <20251203152403.514814699@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152400.447697997@linuxfoundation.org> References: <20251203152400.447697997@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 5.10-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 e6fa2782d28f2..ac278d81f1614 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5415,7 +5415,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); -- 2.51.0