AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()'

Browse Source 
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:
Christophe JAILLET 2020-04-27 22:21:16 +02:00 committed by Felipe Balbi
parent 95cd7dc47a
commit f058764d19
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/phy/phy-twl6030-usb.c
View File

@ -377,7 +377,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
if (status < 0) { if (status < 0) {
dev_err(&pdev->dev, "can't get IRQ %d, err %d\n", dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
twl->irq1, status); twl->irq1, status);
return status; goto err_put_regulator;
} }
status = request_threaded_irq(twl->irq2, NULL, twl6030_usb_irq, 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) { if (status < 0) {
dev_err(&pdev->dev, "can't get IRQ %d, err %d\n", dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
twl->irq2, status); twl->irq2, status);
free_irq(twl->irq1, twl); goto err_free_irq1;
return status;
} }
twl->asleep = 0; 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"); dev_info(&pdev->dev, "Initialized TWL6030 USB module\n");
return 0; 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) static int twl6030_usb_remove(struct platform_device *pdev)