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

This commit is contained in:
Tony Lindgren
2017-11-28 07:06:34 -08:00
23568 changed files with 614096 additions and 281637 deletions

View File

@@ -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)