Merge branch 'soc-fixes' into omap-for-v4.15/fixes

diff --combined arch/arm/mach-omap2/omap_device.c
index 184acd95c216bf4e56a4659b04941254dfd68f59,2e91eb8ab33c1c85b1cb4e22a92910a3cabf5901..f0388058b7da399d28d3819ab268d5d0a2a61073
--- 1/arch/arm/mach-omap2/omap_device.c
--- 2/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@@ -391,8 -391,10 +391,8 @@@ omap_device_copy_resources(struct omap_
        const char *name;
        int error, irq = 0;
  
 -      if (!oh || !oh->od || !oh->od->pdev) {
 -              error = -EINVAL;
 -              goto error;
 -      }
 +      if (!oh || !oh->od || !oh->od->pdev)
 +              return -EINVAL;
  
        np = oh->od->pdev->dev.of_node;
        if (!np) {
@@@ -514,8 -516,10 +514,10 @@@ struct platform_device __init *omap_dev
                goto odbs_exit1;
  
        od = omap_device_alloc(pdev, &oh, 1);
-       if (IS_ERR(od))
+       if (IS_ERR(od)) {
+               ret = PTR_ERR(od);
                goto odbs_exit1;
+       }
  
        ret = platform_device_add_data(pdev, pdata, pdata_len);
        if (ret)