diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 00:18:25 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 00:18:25 -0500 |
| commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
| tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /drivers/ide/ide-disk.c | |
| parent | 7301c8d3a05dc52d33598364da7c4eb6ab6357eb (diff) | |
| parent | 811803c5572b296e0031e0099203de90d77c7bcf (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 234f5de3e929..e827b39e4b3c 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -1215,7 +1215,7 @@ static int ide_disk_probe(struct device *dev) if (drive->media != ide_disk) goto failed; - idkp = kmalloc(sizeof(*idkp), GFP_KERNEL); + idkp = kzalloc(sizeof(*idkp), GFP_KERNEL); if (!idkp) goto failed; @@ -1228,8 +1228,6 @@ static int ide_disk_probe(struct device *dev) ide_register_subdriver(drive, &idedisk_driver); - memset(idkp, 0, sizeof(*idkp)); - kref_init(&idkp->kref); idkp->drive = drive; |