* [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
@ 2017-07-11 10:16 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 8+ messages in thread
From: Kishon Vijay Abraham I @ 2017-07-11 10:16 UTC (permalink / raw)
To: Tony Lindgren, nsekhar
Cc: kishon, linux-omap, linux-arm-kernel, arnd @ arndb . de,
linux-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
@ 2017-07-11 10:16 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 8+ messages in thread
From: Kishon Vijay Abraham I @ 2017-07-11 10:16 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
@ 2017-07-11 10:16 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 8+ messages in thread
From: Kishon Vijay Abraham I @ 2017-07-11 10:16 UTC (permalink / raw)
To: Tony Lindgren, nsekhar
Cc: arnd @ arndb . de, linux-omap, linux-arm-kernel, linux-kernel,
kishon
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
2017-07-11 10:16 ` Kishon Vijay Abraham I
@ 2017-07-12 9:26 ` Tony Lindgren
-1 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2017-07-12 9:26 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: nsekhar, arnd @ arndb . de, linux-omap, linux-arm-kernel,
linux-kernel
* 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
@ 2017-07-12 9:26 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2017-07-12 9:26 UTC (permalink / raw)
To: linux-arm-kernel
* 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
2017-07-12 9:26 ` Tony Lindgren
(?)
@ 2017-07-12 10:57 ` Kishon Vijay Abraham I
-1 siblings, 0 replies; 8+ messages in thread
From: Kishon Vijay Abraham I @ 2017-07-12 10:57 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap, nsekhar, linux-arm-kernel, arnd @ arndb . de,
linux-kernel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
@ 2017-07-12 10:57 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 8+ messages in thread
From: Kishon Vijay Abraham I @ 2017-07-12 10:57 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
@ 2017-07-12 10:57 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 8+ messages in thread
From: Kishon Vijay Abraham I @ 2017-07-12 10:57 UTC (permalink / raw)
To: Tony Lindgren
Cc: nsekhar, arnd @ arndb . de, linux-omap, linux-arm-kernel,
linux-kernel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-07-12 10:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-11 10:16 [RESEND PATCH] bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe Kishon Vijay Abraham I
2017-07-11 10:16 ` Kishon Vijay Abraham I
2017-07-11 10:16 ` Kishon Vijay Abraham I
2017-07-12 9:26 ` Tony Lindgren
2017-07-12 9:26 ` Tony Lindgren
2017-07-12 10:57 ` Kishon Vijay Abraham I
2017-07-12 10:57 ` Kishon Vijay Abraham I
2017-07-12 10:57 ` Kishon Vijay Abraham I
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.