diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-09-18 23:01:58 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-09-18 23:01:58 +0400 |
| commit | 4cf9cf8967f0316722c6cb4ebf8093b74a8e1dd6 (patch) | |
| tree | e26f0ee70581a03935b65128d97b7407703b1b4a | |
| parent | 2cfeed314207f808077edb2f1ba41ba1ebbe3e69 (diff) | |
| download | linux-4cf9cf8967f0316722c6cb4ebf8093b74a8e1dd6.tar.xz | |
ARM: OMAP: fix return value check in omap_device_build_from_dt()
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>
| -rw-r--r-- | arch/arm/mach-omap2/omap_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index f99f68e1e85b..b69dd9abb50a 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -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); |