mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	usb: dwc2: Add missing cleanups when usb_add_gadget_udc() fails
Call dwc2_debugfs_exit() and dwc2_hcd_remove() (if the HCD was enabled
earlier) when usb_add_gadget_udc() has failed. This ensures that the
debugfs entries created by dwc2_debugfs_init() as well as the HCD are
cleaned up in the error path.
Fixes: 207324a321 ("usb: dwc2: Postponed gadget registration to the udc class driver")
Acked-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
			
			
This commit is contained in:
		
							parent
							
								
									e518bdd9f0
								
							
						
					
					
						commit
						e1c08cf231
					
				
					 1 changed files with 5 additions and 1 deletions
				
			
		| 
						 | 
					@ -584,12 +584,16 @@ static int dwc2_driver_probe(struct platform_device *dev)
 | 
				
			||||||
		if (retval) {
 | 
							if (retval) {
 | 
				
			||||||
			hsotg->gadget.udc = NULL;
 | 
								hsotg->gadget.udc = NULL;
 | 
				
			||||||
			dwc2_hsotg_remove(hsotg);
 | 
								dwc2_hsotg_remove(hsotg);
 | 
				
			||||||
			goto error_init;
 | 
								goto error_debugfs;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
#endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */
 | 
					#endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					error_debugfs:
 | 
				
			||||||
 | 
						dwc2_debugfs_exit(hsotg);
 | 
				
			||||||
 | 
						if (hsotg->hcd_enabled)
 | 
				
			||||||
 | 
							dwc2_hcd_remove(hsotg);
 | 
				
			||||||
error_init:
 | 
					error_init:
 | 
				
			||||||
	if (hsotg->params.activate_stm_id_vb_detection)
 | 
						if (hsotg->params.activate_stm_id_vb_detection)
 | 
				
			||||||
		regulator_disable(hsotg->usb33d);
 | 
							regulator_disable(hsotg->usb33d);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue