lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 23 Nov 2020 13:20:24 +0100 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, Minas Harutyunyan <Minas.Harutyunyan@...opsys.com>, kernel test robot <lkp@...el.com>, Jens Axboe <axboe@...nel.dk>, Martin Blumenstingl <martin.blumenstingl@...glemail.com>, Felipe Balbi <balbi@...nel.org>, Kamal Mostafa <kamal@...onical.com>, Sasha Levin <sashal@...nel.org> Subject: [PATCH 5.9 074/252] usb: dwc2: Avoid leaving the error_debugfs label unused From: Martin Blumenstingl <martin.blumenstingl@...glemail.com> 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 <Minas.Harutyunyan@...opsys.com> Reported-by: kernel test robot <lkp@...el.com> Reported-by: Jens Axboe <axboe@...nel.dk> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@...glemail.com> Signed-off-by: Felipe Balbi <balbi@...nel.org> Cc: stable@...r.kernel.org # 5.9.x Signed-off-by: Kamal Mostafa <kamal@...onical.com> Signed-off-by: Sasha Levin <sashal@...nel.org> --- 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
Powered by blists - more mailing lists