Skip to content

Commit

Permalink
ARM: OMAP: fix return value check in omap_device_build_from_dt()
Browse files Browse the repository at this point in the history
In case of error, the function omap_device_alloc() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Wei Yongjun authored and Tony Lindgren committed Sep 18, 2013
1 parent 2cfeed3 commit 4cf9cf8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/omap_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
}

od = omap_device_alloc(pdev, hwmods, oh_cnt);
if (!od) {
if (IS_ERR(od)) {
dev_err(&pdev->dev, "Cannot allocate omap_device for :%s\n",
oh_name);
ret = PTR_ERR(od);
Expand Down

0 comments on commit 4cf9cf8

Please sign in to comment.