diff options
| author | Olof Johansson <olof@lixom.net> | 2017-09-05 20:29:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-09-05 20:29:46 -0700 |
| commit | 9ec83463d679a51560135ac8cf023567fbb6e4c0 (patch) | |
| tree | c79dd6cfc3bc99af5590298eebf55ab7ee354b01 /drivers | |
| parent | a93fae750d462ae94b83c5c4e21ffa67e4870135 (diff) | |
| parent | 2ad93fa37fdd7f5525333240633557effacb28ff (diff) | |
| download | talos-op-linux-9ec83463d679a51560135ac8cf023567fbb6e4c0.tar.gz talos-op-linux-9ec83463d679a51560135ac8cf023567fbb6e4c0.zip | |
Merge branch 'next/cleanup' into next/soc
* next/cleanup:
soc: versatile: remove unnecessary static in realview_soc_probe()
ARM: Convert to using %pOF instead of full_name
ARM: hisi: Fix typo in comment
ARM: OMAP4+: PRM: fix of_irq_get() result checks
ARM: OMAP3+: PRM: fix of_irq_get() result check
ARM: dts: dra72-evm-revc: workaround incorrect DP83867 RX_CTRL pin strap
ARM: dts: dra71-evm: workaround incorrect DP83867 RX_CTRL pin strap
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')
| -rw-r--r-- | drivers/bus/omap-ocp2scp.c | 9 | ||||
| -rw-r--r-- | drivers/soc/versatile/soc-realview.c | 2 |
2 files changed, 8 insertions, 3 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); diff --git a/drivers/soc/versatile/soc-realview.c b/drivers/soc/versatile/soc-realview.c index 282e371378ce..caf698e5f0b0 100644 --- a/drivers/soc/versatile/soc-realview.c +++ b/drivers/soc/versatile/soc-realview.c @@ -85,7 +85,7 @@ static struct device_attribute realview_build_attr = static int realview_soc_probe(struct platform_device *pdev) { - static struct regmap *syscon_regmap; + struct regmap *syscon_regmap; struct soc_device *soc_dev; struct soc_device_attribute *soc_dev_attr; struct device_node *np = pdev->dev.of_node; |
