]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ARM: OMAP: fix return value check in omap_device_build_from_dt()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Wed, 18 Sep 2013 19:01:58 +0000 (12:01 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 18 Sep 2013 19:01:58 +0000 (12:01 -0700)
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>
arch/arm/mach-omap2/omap_device.c

index f99f68e1e85bd3748c5965a0bd27c47d0f6d538e..b69dd9abb50aeb0003998b24d7df9063a6a41cb1 100644 (file)
@@ -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);