Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1609030

[PATCH 2/7] usb: dwc3: dwc3-omap: fix dwc3_omap_probe() do put_sync when get_sync works

Show all headers | View raw

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(-)

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;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] dwc3 - bug fixes and use meaningful goto labels Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-25 01:10 +0100
  [PATCH 7/7] usb: dwc3: host: change goto labels in this file to meaningful names Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-25 01:10 +0100
  [PATCH 2/7] usb: dwc3: dwc3-omap: fix dwc3_omap_probe() do put_sync when get_sync works Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-25 01:10 +0100
    Re: [PATCH 2/7] usb: dwc3: dwc3-omap: fix dwc3_omap_probe() do put_sync when get_sync works Felipe Balbi <balbi@kernel.org> - 2017-03-25 09:00 +0100
  [PATCH 3/7] usb: dwc3: core: change goto labels to meaningful names Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-25 01:10 +0100
  [PATCH 6/7] usb: dwc3: gadget: change goto labels in this file to meaningful names Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-25 01:10 +0100
  [PATCH 4/7] usb: dwc3: exynos: change goto labels in this file to meaningful names Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-25 01:10 +0100
  [PATCH 5/7] usb: dwc3: omap: change goto labels in this file to meaningful names Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-25 01:10 +0100
  Re: [PATCH 0/7] dwc3 - bug fixes and use meaningful goto labels Felipe Balbi <balbi@kernel.org> - 2017-03-25 09:00 +0100
    Re: [PATCH 0/7] dwc3 - bug fixes and use meaningful goto labels Shuah Khan <shuahkh@osg.samsung.com> - 2017-03-27 15:50 +0200

csiph-web