diff mbox

ARM: mmp: fix potential NULL dereference

Message ID 1344416528-3586-1-git-send-email-yliu.null@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Yuanhan Liu Aug. 8, 2012, 9:02 a.m. UTC
Fix the wrong logic: we should use || instead of &&

Cc: Leo Yan <leoy@marvell.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Yuanhan Liu <yliu.null@gmail.com>
---
 arch/arm/mach-mmp/sram.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Haojian Zhuang Aug. 10, 2012, 2:29 p.m. UTC | #1
On Wed, Aug 8, 2012 at 5:02 PM, Yuanhan Liu <yliu.null@gmail.com> wrote:
> Fix the wrong logic: we should use || instead of &&
>
> Cc: Leo Yan <leoy@marvell.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Signed-off-by: Yuanhan Liu <yliu.null@gmail.com>
> ---
>  arch/arm/mach-mmp/sram.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
Applied.

Thanks
Haojian
diff mbox

Patch

diff --git a/arch/arm/mach-mmp/sram.c b/arch/arm/mach-mmp/sram.c
index 4304f95..7e8a5a2 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);