From: Miaoqian Lin linmq006@gmail.com
[ Upstream commit 045a31b95509c8f25f5f04ec5e0dec5cd09f2c5f ]
callers of tegra_xusb_find_port_node() function only do NULL checking for the return value. return NULL instead of ERR_PTR(-ENOMEM) to keep consistent.
Signed-off-by: Miaoqian Lin linmq006@gmail.com Acked-by: Thierry Reding treding@nvidia.com Link: https://lore.kernel.org/r/20211213020507.1458-1-linmq006@gmail.com Signed-off-by: Vinod Koul vkoul@kernel.org Signed-off-by: Alva Lan alvalan9@foxmail.com --- drivers/phy/tegra/xusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c index bf7706bf101a..be31b1e25b38 100644 --- a/drivers/phy/tegra/xusb.c +++ b/drivers/phy/tegra/xusb.c @@ -455,7 +455,7 @@ tegra_xusb_find_port_node(struct tegra_xusb_padctl *padctl, const char *type, name = kasprintf(GFP_KERNEL, "%s-%u", type, index); if (!name) { of_node_put(ports); - return ERR_PTR(-ENOMEM); + return NULL; } np = of_get_child_by_name(ports, name); kfree(name);
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 045a31b95509c8f25f5f04ec5e0dec5cd09f2c5f
WARNING: Author mismatch between patch and upstream commit: Backport author: alvalan9@foxmail.com Commit author: Miaoqian Linlinmq006@gmail.com
Status in newer kernel trees: 6.13.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1)
Note: The patch differs from the upstream commit: --- 1: 045a31b95509c ! 1: e3c2c38253c60 phy: tegra: xusb: Fix return value of tegra_xusb_find_port_node function @@ Metadata ## Commit message ## phy: tegra: xusb: Fix return value of tegra_xusb_find_port_node function
+ [ Upstream commit 045a31b95509c8f25f5f04ec5e0dec5cd09f2c5f ] + callers of tegra_xusb_find_port_node() function only do NULL checking for the return value. return NULL instead of ERR_PTR(-ENOMEM) to keep consistent. @@ Commit message Acked-by: Thierry Reding treding@nvidia.com Link: https://lore.kernel.org/r/20211213020507.1458-1-linmq006@gmail.com Signed-off-by: Vinod Koul vkoul@kernel.org + Signed-off-by: Alva Lan alvalan9@foxmail.com
## drivers/phy/tegra/xusb.c ## @@ drivers/phy/tegra/xusb.c: tegra_xusb_find_port_node(struct tegra_xusb_padctl *padctl, const char *type, ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.15.y | Success | Success |
linux-stable-mirror@lists.linaro.org
-
alvalan9＠foxmail.com -
Sasha Levin