Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1684943 > unrolled thread
| Started by | Kishon Vijay Abraham I <kishon@ti.com> |
|---|---|
| First post | 2017-07-11 12:20 +0200 |
| Last post | 2017-07-12 13:00 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe Kishon Vijay Abraham I <kishon@ti.com> - 2017-07-11 12:20 +0200
Re: [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe Tony Lindgren <tony@atomide.com> - 2017-07-12 11:30 +0200
Re: [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe Kishon Vijay Abraham I <kishon@ti.com> - 2017-07-12 13:00 +0200
| From | Kishon Vijay Abraham I <kishon@ti.com> |
|---|---|
| Date | 2017-07-11 12:20 +0200 |
| Subject | [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe |
| Message-ID | <u20qS-Yv-5@gated-at.bofh.it> |
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.
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);
--
2.11.0
[toc] | [next] | [standalone]
| From | Tony Lindgren <tony@atomide.com> |
|---|---|
| Date | 2017-07-12 11:30 +0200 |
| Subject | Re: [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe |
| Message-ID | <u2m81-6pg-1@gated-at.bofh.it> |
| In reply to | #1684943 |
* Kishon Vijay Abraham I <kishon@ti.com> [170711 03:17]: > 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. Applying into omap-for-v4.13/fixes thanks. Tony
[toc] | [prev] | [next] | [standalone]
| From | Kishon Vijay Abraham I <kishon@ti.com> |
|---|---|
| Date | 2017-07-12 13:00 +0200 |
| Subject | Re: [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe |
| Message-ID | <u2nx9-7a5-9@gated-at.bofh.it> |
| In reply to | #1685651 |
On Wednesday 12 July 2017 02:56 PM, Tony Lindgren wrote: > * Kishon Vijay Abraham I <kishon@ti.com> [170711 03:17]: >> 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. > > Applying into omap-for-v4.13/fixes thanks. Thanks! -Kishon
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web