From: Sasha Levin Date: Sun, 22 Nov 2020 19:20:08 +0000 (-0500) Subject: Fixes for 5.9 X-Git-Tag: v4.4.246~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=201a942bc76333836df1048599e74d8a428ba4b1;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.9 Signed-off-by: Sasha Levin --- diff --git a/queue-5.9/series b/queue-5.9/series index be43f2e1c4d..fd0e8427444 100644 --- a/queue-5.9/series +++ b/queue-5.9/series @@ -71,3 +71,4 @@ gfs2-fix-case-in-which-ail-writes-are-done-to-jdata-.patch arm64-add-midr-value-for-kryo2xx-gold-silver-cpu-cor.patch arm64-kpti-add-kryo2xx-gold-silver-cpu-cores-to-kpti.patch arm64-cpu_errata-apply-erratum-845719-to-kryo2xx-sil.patch +usb-dwc2-avoid-leaving-the-error_debugfs-label-unuse.patch diff --git a/queue-5.9/usb-dwc2-avoid-leaving-the-error_debugfs-label-unuse.patch b/queue-5.9/usb-dwc2-avoid-leaving-the-error_debugfs-label-unuse.patch new file mode 100644 index 00000000000..e44116cfbdf --- /dev/null +++ b/queue-5.9/usb-dwc2-avoid-leaving-the-error_debugfs-label-unuse.patch @@ -0,0 +1,54 @@ +From a977671e546a1f74ce415fd5f2216290ba9f628d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Nov 2020 08:46:45 -0800 +Subject: usb: dwc2: Avoid leaving the error_debugfs label unused +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Martin Blumenstingl + +commit 190bb01b72d2d5c3654a03c42fb1ad0dc6114c79 upstream. + +The error_debugfs label is only used when either +CONFIG_USB_DWC2_PERIPHERAL or CONFIG_USB_DWC2_DUAL_ROLE is enabled. Add +the same #if to the error_debugfs label itself as the code which uses +this label already has. + +This avoids the following compiler warning: + warning: label ‘error_debugfs’ defined but not used [-Wunused-label] + +Fixes: e1c08cf23172ed ("usb: dwc2: Add missing cleanups when usb_add_gadget_udc() fails") +Acked-by: Minas Harutyunyan +Reported-by: kernel test robot +Reported-by: Jens Axboe +Signed-off-by: Martin Blumenstingl +Signed-off-by: Felipe Balbi +Cc: stable@vger.kernel.org # 5.9.x +Signed-off-by: Kamal Mostafa +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc2/platform.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c +index b28e90e0b685d..8a7f86e1ef73a 100644 +--- a/drivers/usb/dwc2/platform.c ++++ b/drivers/usb/dwc2/platform.c +@@ -590,10 +590,13 @@ static int dwc2_driver_probe(struct platform_device *dev) + #endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */ + return 0; + ++#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \ ++ IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) + error_debugfs: + dwc2_debugfs_exit(hsotg); + if (hsotg->hcd_enabled) + dwc2_hcd_remove(hsotg); ++#endif + error_init: + if (hsotg->params.activate_stm_id_vb_detection) + regulator_disable(hsotg->usb33d); +-- +2.27.0 +