mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()'
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. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Felipe Balbi <balbi@kernel.org>
This commit is contained in:
parent
95cd7dc47a
commit
f058764d19
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user