Commit 8a211d36 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: mmp: fix potential NULL dereference
parents 0a224c51 c0db19da
...@@ -68,7 +68,7 @@ static int __devinit sram_probe(struct platform_device *pdev) ...@@ -68,7 +68,7 @@ static int __devinit sram_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int ret = 0; int ret = 0;
if (!pdata && !pdata->pool_name) if (!pdata || !pdata->pool_name)
return -ENODEV; return -ENODEV;
info = kzalloc(sizeof(*info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment