projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d6f0c3
)
powerpc/44x: Fix ocm_block allocation
author
Ilia Mirkin
<imirkin@alum.mit.edu>
Sat, 7 Dec 2013 00:43:37 +0000
(19:43 -0500)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Tue, 10 Dec 2013 00:25:04 +0000
(11:25 +1100)
Allocate enough memory for the ocm_block structure, not just a pointer
to it.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/sysdev/ppc4xx_ocm.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/sysdev/ppc4xx_ocm.c
b/arch/powerpc/sysdev/ppc4xx_ocm.c
index b7c43453236dfac7d001b583e554d8938b0ba426..85d9e37f5ccbf76c93c2cf71c1d70677d7a14366 100644
(file)
--- a/
arch/powerpc/sysdev/ppc4xx_ocm.c
+++ b/
arch/powerpc/sysdev/ppc4xx_ocm.c
@@
-339,7
+339,7
@@
void *ppc4xx_ocm_alloc(phys_addr_t *phys, int size, int align,
if (IS_ERR_VALUE(offset))
continue;
- ocm_blk = kzalloc(sizeof(struct ocm_block
*
), GFP_KERNEL);
+ ocm_blk = kzalloc(sizeof(struct ocm_block), GFP_KERNEL);
if (!ocm_blk) {
printk(KERN_ERR "PPC4XX OCM: could not allocate ocm block");
rh_free(ocm_reg->rh, offset);