git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-integrator
/
impd1.c
diff --git
a/arch/arm/mach-integrator/impd1.c
b/arch/arm/mach-integrator/impd1.c
index
92d79fb
..
a85d471
100644
(file)
--- a/
arch/arm/mach-integrator/impd1.c
+++ b/
arch/arm/mach-integrator/impd1.c
@@
-355,11
+355,12
@@
static int impd1_probe(struct lm_device *dev)
if (!request_mem_region(dev->resource.start, SZ_4K, "LM registers"))
return -EBUSY;
if (!request_mem_region(dev->resource.start, SZ_4K, "LM registers"))
return -EBUSY;
- impd1 = k
z
alloc(sizeof(struct impd1_module), GFP_KERNEL);
+ impd1 = k
m
alloc(sizeof(struct impd1_module), GFP_KERNEL);
if (!impd1) {
ret = -ENOMEM;
goto release_lm;
}
if (!impd1) {
ret = -ENOMEM;
goto release_lm;
}
+ memset(impd1, 0, sizeof(struct impd1_module));
impd1->base = ioremap(dev->resource.start, SZ_4K);
if (!impd1->base) {
impd1->base = ioremap(dev->resource.start, SZ_4K);
if (!impd1->base) {
@@
-388,10
+389,12
@@
static int impd1_probe(struct lm_device *dev)
pc_base = dev->resource.start + idev->offset;
pc_base = dev->resource.start + idev->offset;
- d = k
z
alloc(sizeof(struct amba_device), GFP_KERNEL);
+ d = k
m
alloc(sizeof(struct amba_device), GFP_KERNEL);
if (!d)
continue;
if (!d)
continue;
+ memset(d, 0, sizeof(struct amba_device));
+
snprintf(d->dev.bus_id, sizeof(d->dev.bus_id),
"lm%x:%5.5lx", dev->id, idev->offset >> 12);
snprintf(d->dev.bus_id, sizeof(d->dev.bus_id),
"lm%x:%5.5lx", dev->id, idev->offset >> 12);