diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-09-18 15:01:58 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-09-18 15:01:58 -0400 |
commit | 4cf9cf8967f0316722c6cb4ebf8093b74a8e1dd6 (patch) | |
tree | e26f0ee70581a03935b65128d97b7407703b1b4a /arch | |
parent | 2cfeed314207f808077edb2f1ba41ba1ebbe3e69 (diff) |
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>
Diffstat (limited to 'arch')
-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) | |||
158 | } | 158 | } |
159 | 159 | ||
160 | od = omap_device_alloc(pdev, hwmods, oh_cnt); | 160 | od = omap_device_alloc(pdev, hwmods, oh_cnt); |
161 | if (!od) { | 161 | if (IS_ERR(od)) { |
162 | dev_err(&pdev->dev, "Cannot allocate omap_device for :%s\n", | 162 | dev_err(&pdev->dev, "Cannot allocate omap_device for :%s\n", |
163 | oh_name); | 163 | oh_name); |
164 | ret = PTR_ERR(od); | 164 | ret = PTR_ERR(od); |