diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 15:24:04 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 15:24:04 +0100 |
commit | 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch) | |
tree | b01421cb139b11065d776ed361a7a12b3a1aecc9 /arch/arm/common/scoop.c | |
parent | Merge branch 'upstream' (diff) | |
parent | [libata] Move some bmdma-specific code to libata-bmdma.c (diff) | |
download | linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.tar.xz linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.zip |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
Diffstat (limited to 'arch/arm/common/scoop.c')
-rw-r--r-- | arch/arm/common/scoop.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index a2dfe0b0f1ec..5e830f444c6c 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -132,12 +132,10 @@ int __init scoop_probe(struct platform_device *pdev) if (!mem) return -EINVAL; - devptr = kmalloc(sizeof(struct scoop_dev), GFP_KERNEL); - + devptr = kzalloc(sizeof(struct scoop_dev), GFP_KERNEL); if (!devptr) - return -ENOMEM; + return -ENOMEM; - memset(devptr, 0, sizeof(struct scoop_dev)); spin_lock_init(&devptr->scoop_lock); inf = pdev->dev.platform_data; |