path: root/drivers/bus
diff options
authorArnd Bergmann <arnd@arndb.de>2017-08-19 00:07:56 +0200
committerArnd Bergmann <arnd@arndb.de>2017-08-19 00:07:56 +0200
commit2ad93fa37fdd7f5525333240633557effacb28ff (patch)
tree43631624e5892901b09e5b3652f68ed85895aa3d /drivers/bus
parentdb86ab06161a1678bacd1e8daad03ae8b6b684bd (diff)
parent879dce79531ea82f78d662c4651be07761c6e41a (diff)
Merge tag 'omap-for-v4.14/fixes-not-urgent-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Pull "non-urgent fixes for omaps for v4.14" from Tony Lindgren: Non-urgent fixes for omaps for v4.14 merge window. These all can wait for the merge window as we have not seemed to hit any of these so far: - Fix error handling in omap_ocp2scp_probe affecting runtime PM error path - Drop broken RPM status update for omap_device - Two fixes for of_irq_get() usage that can return 0 * tag 'omap-for-v4.14/fixes-not-urgent-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP4+: PRM: fix of_irq_get() result checks ARM: OMAP3+: PRM: fix of_irq_get() result check ARM: OMAP2+: omap_device: drop broken RPM status update from suspend_noirq bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
Diffstat (limited to 'drivers/bus')
1 files 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;
+ }
reg = readl_relaxed(regs + OCP2SCP_TIMING);
@@ -83,6 +85,9 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)
return 0;
+ pm_runtime_disable(&pdev->dev);
device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);

Privacy Policy