From 8371d59dbb2fe578993816aaf78ef991a08cd638 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: May 04 2023 09:38:24 +0000 Subject: usb: chipidea: fix missing goto in `ci_hdrc_probe` (git-fixes). --- diff --git a/patches.suse/usb-chipidea-fix-missing-goto-in-ci_hdrc_probe.patch b/patches.suse/usb-chipidea-fix-missing-goto-in-ci_hdrc_probe.patch new file mode 100644 index 0000000..6f848b1 --- /dev/null +++ b/patches.suse/usb-chipidea-fix-missing-goto-in-ci_hdrc_probe.patch @@ -0,0 +1,41 @@ +From d6f712f53b79f5017cdcefafb7a5aea9ec52da5d Mon Sep 17 00:00:00 2001 +From: Yinhao Hu +Date: Wed, 12 Apr 2023 13:58:52 +0800 +Subject: [PATCH] usb: chipidea: fix missing goto in `ci_hdrc_probe` +Git-commit: d6f712f53b79f5017cdcefafb7a5aea9ec52da5d +References: git-fixes +Patch-mainline: v6.4-rc1 + +From the comment of ci_usb_phy_init, it returns an error code if +usb_phy_init has failed, and it should do some clean up, not just +return directly. + +Fix this by goto the error handling. + +Fixes: 74475ede784d ("usb: chipidea: move PHY operation to core") +Reviewed-by: Dongliang Mu +Acked-by: Peter Chen +Signed-off-by: Yinhao Hu +Link: https://lore.kernel.org/r/20230412055852.971991-1-dddddd@hust.edu.cn +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Oliver Neukum +--- + drivers/usb/chipidea/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c +index d1d252c87e4f..798cb077867a 100644 +--- a/drivers/usb/chipidea/core.c ++++ b/drivers/usb/chipidea/core.c +@@ -1108,7 +1108,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) + ret = ci_usb_phy_init(ci); + if (ret) { + dev_err(dev, "unable to init phy: %d\n", ret); +- return ret; ++ goto ulpi_exit; + } + + ci->hw_bank.phys = res->start; +-- +2.40.1 + diff --git a/series.conf b/series.conf index 5e4e2c8..a969493 100644 --- a/series.conf +++ b/series.conf @@ -63268,6 +63268,7 @@ patches.suse/ipmi-fix-SSIF-not-responding-under-certain-cond.patch patches.suse/USB-dwc3-fix-runtime-pm-imbalance-on-probe-errors.patch patches.suse/USB-dwc3-fix-runtime-pm-imbalance-on-unbind.patch + patches.suse/usb-chipidea-fix-missing-goto-in-ci_hdrc_probe.patch patches.suse/xfs-verify-buffer-contents-when-we-skip-log-replay.patch # dhowells/linux-fs keys-uefi