diff options
Diffstat (limited to 'arch/arm/mach-integrator/impd1.c')
-rw-r--r-- | arch/arm/mach-integrator/impd1.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index a85d471c5bfa..92d79fb39311 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
@@ -355,12 +355,11 @@ static int impd1_probe(struct lm_device *dev) | |||
355 | if (!request_mem_region(dev->resource.start, SZ_4K, "LM registers")) | 355 | if (!request_mem_region(dev->resource.start, SZ_4K, "LM registers")) |
356 | return -EBUSY; | 356 | return -EBUSY; |
357 | 357 | ||
358 | impd1 = kmalloc(sizeof(struct impd1_module), GFP_KERNEL); | 358 | impd1 = kzalloc(sizeof(struct impd1_module), GFP_KERNEL); |
359 | if (!impd1) { | 359 | if (!impd1) { |
360 | ret = -ENOMEM; | 360 | ret = -ENOMEM; |
361 | goto release_lm; | 361 | goto release_lm; |
362 | } | 362 | } |
363 | memset(impd1, 0, sizeof(struct impd1_module)); | ||
364 | 363 | ||
365 | impd1->base = ioremap(dev->resource.start, SZ_4K); | 364 | impd1->base = ioremap(dev->resource.start, SZ_4K); |
366 | if (!impd1->base) { | 365 | if (!impd1->base) { |
@@ -389,12 +388,10 @@ static int impd1_probe(struct lm_device *dev) | |||
389 | 388 | ||
390 | pc_base = dev->resource.start + idev->offset; | 389 | pc_base = dev->resource.start + idev->offset; |
391 | 390 | ||
392 | d = kmalloc(sizeof(struct amba_device), GFP_KERNEL); | 391 | d = kzalloc(sizeof(struct amba_device), GFP_KERNEL); |
393 | if (!d) | 392 | if (!d) |
394 | continue; | 393 | continue; |
395 | 394 | ||
396 | memset(d, 0, sizeof(struct amba_device)); | ||
397 | |||
398 | snprintf(d->dev.bus_id, sizeof(d->dev.bus_id), | 395 | snprintf(d->dev.bus_id, sizeof(d->dev.bus_id), |
399 | "lm%x:%5.5lx", dev->id, idev->offset >> 12); | 396 | "lm%x:%5.5lx", dev->id, idev->offset >> 12); |
400 | 397 | ||