aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-10-08 17:32:49 -0400
committerTony Lindgren <tony@atomide.com>2012-10-08 18:43:57 -0400
commit9ee677231bbc6a9e6ec9057d33d81eb248742b0a (patch)
tree3aaaeee9a931fa54c1b229f85bd5ea653794d2f8
parentf0cfa981cec09e6e353295e0f8dc36bc10289996 (diff)
OMAPDSS: fix return value check in create_dss_pdev()
In case of error, the function omap_device_alloc() returns ERR_PTR() not 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: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 7012068ccbf6..a51ece491b91 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -221,7 +221,7 @@ static struct platform_device *create_dss_pdev(const char *pdev_name,
221 221
222 ohs[0] = oh; 222 ohs[0] = oh;
223 od = omap_device_alloc(pdev, ohs, 1, NULL, 0); 223 od = omap_device_alloc(pdev, ohs, 1, NULL, 0);
224 if (!od) { 224 if (IS_ERR(od)) {
225 pr_err("Could not alloc omap_device for %s\n", pdev_name); 225 pr_err("Could not alloc omap_device for %s\n", pdev_name);
226 r = -ENOMEM; 226 r = -ENOMEM;
227 goto err; 227 goto err;