diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-21 10:32:04 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-10-03 01:34:09 +0400 |
| commit | a87e662827bca4b10a320e62da3fb21826eab987 (patch) | |
| tree | f75a9ed2ed80d25c715f8321908d3cf246c713df | |
| parent | 104c7949e20e84dedddb66c1fc4b599931382d21 (diff) | |
| download | linux-a87e662827bca4b10a320e62da3fb21826eab987.tar.xz | |
ARM: OMAP: omap_device: fix return value check in omap_device_build_ss()
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>
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index c490240bb82c..3f62de67fa4a 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -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); |