diff options
author | Deepak Saxena <dsaxena@plexity.net> | 2005-11-07 04:01:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:00 -0500 |
commit | f5e3c2faa20615e900ab26bd957f898400435924 (patch) | |
tree | d3dd4c93539f155e3fd4ef18ae9cfe482ed1b340 /drivers/ide/ide-probe.c | |
parent | 9c2153844d72ac92b6da0ee42f7f81fb0aa91f8a (diff) |
[PATCH] ide: kmalloc + memset -> kzalloc conversion
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index c1128ae5cd2f..e6695e5df5bd 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -596,14 +596,13 @@ static inline u8 probe_for_drive (ide_drive_t *drive) | |||
596 | * Also note that 0 everywhere means "can't do X" | 596 | * Also note that 0 everywhere means "can't do X" |
597 | */ | 597 | */ |
598 | 598 | ||
599 | drive->id = kmalloc(SECTOR_WORDS *4, GFP_KERNEL); | 599 | drive->id = kzalloc(SECTOR_WORDS *4, GFP_KERNEL); |
600 | drive->id_read = 0; | 600 | drive->id_read = 0; |
601 | if(drive->id == NULL) | 601 | if(drive->id == NULL) |
602 | { | 602 | { |
603 | printk(KERN_ERR "ide: out of memory for id data.\n"); | 603 | printk(KERN_ERR "ide: out of memory for id data.\n"); |
604 | return 0; | 604 | return 0; |
605 | } | 605 | } |
606 | memset(drive->id, 0, SECTOR_WORDS * 4); | ||
607 | strcpy(drive->id->model, "UNKNOWN"); | 606 | strcpy(drive->id->model, "UNKNOWN"); |
608 | 607 | ||
609 | /* skip probing? */ | 608 | /* skip probing? */ |