| Message ID | a7d3539cdb21ef9694869f97a357ce40ace0ddd3.1490387086.git.shuahkh@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, Shuah Khan <shuahkh@osg.samsung.com> writes: > dwc3_omap_probe() does pm_runtime_put_sync() in its err1 handling when > pm_runtime_get_sync() fails. Fix it to do put_sync only when get_sync > succeeds. > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> sorry, not taking any of these pointless patches. There's nothing wrong with the goto labels, there's nothing wrong with the error path in any of these drivers.
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 2092e46..55b12a9 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -518,25 +518,26 @@ static int dwc3_omap_probe(struct platform_device *pdev) if (ret) { dev_err(dev, "failed to request IRQ #%d --> %d\n", omap->irq, ret); - goto err1; + goto put_sync; } ret = dwc3_omap_extcon_register(omap); if (ret < 0) - goto err1; + goto put_sync; ret = of_platform_populate(node, NULL, NULL, dev); if (ret) { dev_err(&pdev->dev, "failed to create dwc3 core\n"); - goto err1; + goto put_sync; } dwc3_omap_enable_irqs(omap); enable_irq(omap->irq); return 0; -err1: +put_sync: pm_runtime_put_sync(dev); +err1: pm_runtime_disable(dev); return ret;
dwc3_omap_probe() does pm_runtime_put_sync() in its err1 handling when pm_runtime_get_sync() fails. Fix it to do put_sync only when get_sync succeeds. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> --- drivers/usb/dwc3/dwc3-omap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)