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

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 184acd95c216..f0388058b7da 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -514,8 +514,10 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
                 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)