]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: OMAP: omap_device: fix return value check in omap_device_build_ss()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Fri, 21 Sep 2012 06:32:04 +0000 (14:32 +0800)
committerKevin Hilman <khilman@ti.com>
Tue, 2 Oct 2012 21:34:09 +0000 (14:34 -0700)
In case of error, the function omap_device_alloc() returns ERR_PTR()
and never returns NULL pointer. The NULL test in the return value
check should be replaced with IS_ERR().

dpatch engine is used to auto generated this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Kevin Hilman <khilman@ti.com>
arch/arm/plat-omap/omap_device.c

index c490240bb82c7be0e8b1e11636e7bde2b9face6a..3f62de67fa4a7be6da18dcc6f7f81ae2954f6c34 100644 (file)
@@ -671,7 +671,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p
                dev_set_name(&pdev->dev, "%s", pdev->name);
 
        od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt);
-       if (!od)
+       if (IS_ERR(od))
                goto odbs_exit1;
 
        ret = platform_device_add_data(pdev, pdata, pdata_len);