From: Yuanhan Liu <yliu.null@gmail.com>
Date: Wed, 8 Aug 2012 09:02:08 +0000 (+0800)
Subject: ARM: mmp: fix potential NULL dereference
X-Git-Tag: MMI-PSA29.97-13-9~16070^2~4^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0db19dabf138741e078f6391fb132821c0d98b5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: mmp: fix potential NULL dereference

Fix the wrong logic: we should use || instead of &&

Cc: Leo Yan <leoy@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Yuanhan Liu <yliu.null@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
---

diff --git a/arch/arm/mach-mmp/sram.c b/arch/arm/mach-mmp/sram.c
index 4304f9519372..7e8a5a2e1ec7 100644
--- a/arch/arm/mach-mmp/sram.c
+++ b/arch/arm/mach-mmp/sram.c
@@ -68,7 +68,7 @@ static int __devinit sram_probe(struct platform_device *pdev)
 	struct resource *res;
 	int ret = 0;
 
-	if (!pdata && !pdata->pool_name)
+	if (!pdata || !pdata->pool_name)
 		return -ENODEV;
 
 	info = kzalloc(sizeof(*info), GFP_KERNEL);