diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 04:10:15 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 04:10:15 -0400 |
| commit | 8a211d362cc94df2bb42323ab13d258650529bec (patch) | |
| tree | b7d4e58daa21698aae519c3352bd0e2c42a9c125 | |
| parent | 0a224c514f3e9620e167f9f6497ae526a41df22c (diff) | |
| parent | c0db19dabf138741e078f6391fb132821c0d98b5 (diff) | |
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) | |||
| 68 | struct resource *res; | 68 | struct resource *res; |
| 69 | int ret = 0; | 69 | int ret = 0; |
| 70 | 70 | ||
| 71 | if (!pdata && !pdata->pool_name) | 71 | if (!pdata || !pdata->pool_name) |
| 72 | return -ENODEV; | 72 | return -ENODEV; |
| 73 | 73 | ||
| 74 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 74 | info = kzalloc(sizeof(*info), GFP_KERNEL); |