| Message ID | 20200427202116.94380-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f058764d19000d98aef72010468db1f69faf9fa0 |
| Headers | show |
| Series | usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()' | expand |
On Mon, Apr 27, 2020 at 10:21:16PM +0200, Christophe JAILLET wrote: > A call to 'regulator_get()' is hidden in 'twl6030_usb_ldo_init()'. A > corresponding put must be performed in the error handling path, as > already done in the remove function. > > While at it, also move a 'free_irq()' call in the error handling path in > order to be consistent. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > Maybe adding a 'twl6030_usb_ldo_uninit()' function would be more explicit. It would be nicer, yes, but probably this is fine too. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> regards, dan carpenter
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c index bfebf1f2e991..9a7e655d5280 100644 --- a/drivers/usb/phy/phy-twl6030-usb.c +++ b/drivers/usb/phy/phy-twl6030-usb.c @@ -377,7 +377,7 @@ static int twl6030_usb_probe(struct platform_device *pdev) if (status < 0) { dev_err(&pdev->dev, "can't get IRQ %d, err %d\n", twl->irq1, status); - return status; + goto err_put_regulator; } status = request_threaded_irq(twl->irq2, NULL, twl6030_usb_irq, @@ -386,8 +386,7 @@ static int twl6030_usb_probe(struct platform_device *pdev) if (status < 0) { dev_err(&pdev->dev, "can't get IRQ %d, err %d\n", twl->irq2, status); - free_irq(twl->irq1, twl); - return status; + goto err_free_irq1; } twl->asleep = 0; @@ -396,6 +395,13 @@ static int twl6030_usb_probe(struct platform_device *pdev) dev_info(&pdev->dev, "Initialized TWL6030 USB module\n"); return 0; + +err_free_irq1: + free_irq(twl->irq1, twl); +err_put_regulator: + regulator_put(twl->usb3v3); + + return status; } static int twl6030_usb_remove(struct platform_device *pdev)
A call to 'regulator_get()' is hidden in 'twl6030_usb_ldo_init()'. A corresponding put must be performed in the error handling path, as already done in the remove function. While at it, also move a 'free_irq()' call in the error handling path in order to be consistent. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Maybe adding a 'twl6030_usb_ldo_uninit()' function would be more explicit. --- drivers/usb/phy/phy-twl6030-usb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)