diff options
| author | Arnd Bergmann | 2012-08-16 10:10:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2012-08-16 10:10:15 +0200 |
| commit | 8a211d362cc94df2bb42323ab13d258650529bec (patch) | |
| tree | b7d4e58daa21698aae519c3352bd0e2c42a9c125 | |
| parent | Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux ... (diff) | |
| parent | ARM: mmp: fix potential NULL dereference (diff) | |
| download | kernel-qcow2-linux-8a211d362cc94df2bb42323ab13d258650529bec.tar.gz kernel-qcow2-linux-8a211d362cc94df2bb42323ab13d258650529bec.tar.xz kernel-qcow2-linux-8a211d362cc94df2bb42323ab13d258650529bec.zip | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux:
ARM: mmp: fix potential NULL dereference
| -rw-r--r-- | arch/arm/mach-mmp/sram.c | 2 |
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); |