| Message ID | 20170519084631.361-1-kishon@ti.com |
|---|---|
| State | Accepted |
| Commit | 672647afabf5bafd3d855724ee5829e2a9cbd65b |
| Headers | show |
+Tony, Arnd, Hi, On Friday 19 May 2017 02:16 PM, Kishon Vijay Abraham I wrote: > The error handling code in omap_ocp2scp_probe fails to invoke > pm_runtime_disable and fails to initialize return value in > certain cases. Fix it here. Can this patch be picked into arm-soc tree? Thanks Kishon > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > Signed-off-by: Sekhar Nori <nsekhar@ti.com> > --- > drivers/bus/omap-ocp2scp.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c > index bf500e0e7362..77791f3dcfc6 100644 > --- a/drivers/bus/omap-ocp2scp.c > +++ b/drivers/bus/omap-ocp2scp.c > @@ -70,8 +70,10 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) > if (!of_device_is_compatible(np, "ti,am437x-ocp2scp")) { > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > regs = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(regs)) > - goto err0; > + if (IS_ERR(regs)) { > + ret = PTR_ERR(regs); > + goto err1; > + } > > pm_runtime_get_sync(&pdev->dev); > reg = readl_relaxed(regs + OCP2SCP_TIMING); > @@ -83,6 +85,9 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) > > return 0; > > +err1: > + pm_runtime_disable(&pdev->dev); > + > err0: > device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices); > >
* Kishon Vijay Abraham I <kishon@ti.com> [170704 03:23]: > +Tony, Arnd, > > Hi, > > On Friday 19 May 2017 02:16 PM, Kishon Vijay Abraham I wrote: > > The error handling code in omap_ocp2scp_probe fails to invoke > > pm_runtime_disable and fails to initialize return value in > > certain cases. Fix it here. > > Can this patch be picked into arm-soc tree? Yes can you please resend? I don't seem to have it in my inbox. Regards, Tony
Tony, On Wednesday 05 July 2017 01:38 PM, Tony Lindgren wrote: > * Kishon Vijay Abraham I <kishon@ti.com> [170704 03:23]: >> +Tony, Arnd, >> >> Hi, >> >> On Friday 19 May 2017 02:16 PM, Kishon Vijay Abraham I wrote: >>> The error handling code in omap_ocp2scp_probe fails to invoke >>> pm_runtime_disable and fails to initialize return value in >>> certain cases. Fix it here. >> >> Can this patch be picked into arm-soc tree? > > Yes can you please resend? I don't seem to have it in my inbox. re-sent now. Thanks Kishon
diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c index bf500e0e7362..77791f3dcfc6 100644 --- a/drivers/bus/omap-ocp2scp.c +++ b/drivers/bus/omap-ocp2scp.c @@ -70,8 +70,10 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) if (!of_device_is_compatible(np, "ti,am437x-ocp2scp")) { res = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(regs)) - goto err0; + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); + goto err1; + } pm_runtime_get_sync(&pdev->dev); reg = readl_relaxed(regs + OCP2SCP_TIMING); @@ -83,6 +85,9 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) return 0; +err1: + pm_runtime_disable(&pdev->dev); + err0: device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);