projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'multiplatform/platform-data' into next/multiplatform
[platform/kernel/linux-starfive.git]
/
arch
/
arm
/
mach-mmp
/
sram.c
diff --git
a/arch/arm/mach-mmp/sram.c
b/arch/arm/mach-mmp/sram.c
index
b4899b0
..
a6c08ed
100644
(file)
--- 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);