aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-08-16 10:10:15 +0200
committerArnd Bergmann <arnd@arndb.de>2012-08-16 10:10:15 +0200
commit8a211d362cc94df2bb42323ab13d258650529bec (patch)
treeb7d4e58daa21698aae519c3352bd0e2c42a9c125 /arch/arm
parent0a224c514f3e9620e167f9f6497ae526a41df22c (diff)
parentc0db19dabf138741e078f6391fb132821c0d98b5 (diff)
downloadlinux-linaro-stable-8a211d362cc94df2bb42323ab13d258650529bec.tar.gz
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux: ARM: mmp: fix potential NULL dereference
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mmp/sram.c2
1 files changed, 1 insertions, 1 deletions
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);