diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
| commit | f2d40cd92c5604a868b22c44a7858206ae4fcf35 (patch) | |
| tree | 40f3e49465ede8982f6b95b7ba51b9a9ebf22ff6 /drivers/scsi/ide-scsi.c | |
| parent | 3ca135e16a393e5c5cf6490ce751e43c59011dde (diff) | |
| parent | 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 (diff) | |
| download | kernel_replicant_linux-f2d40cd92c5604a868b22c44a7858206ae4fcf35.tar.gz kernel_replicant_linux-f2d40cd92c5604a868b22c44a7858206ae4fcf35.tar.bz2 kernel_replicant_linux-f2d40cd92c5604a868b22c44a7858206ae4fcf35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/ide-scsi.c')
| -rw-r--r-- | drivers/scsi/ide-scsi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index bb90df8bdce4..1cc01acc2808 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c @@ -328,17 +328,15 @@ static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_co u8 *buf; /* stuff a sense request in front of our current request */ - pc = kmalloc (sizeof (idescsi_pc_t), GFP_ATOMIC); - rq = kmalloc (sizeof (struct request), GFP_ATOMIC); - buf = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC); - if (pc == NULL || rq == NULL || buf == NULL) { + pc = kzalloc(sizeof(idescsi_pc_t), GFP_ATOMIC); + rq = kmalloc(sizeof(struct request), GFP_ATOMIC); + buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC); + if (!pc || !rq || !buf) { kfree(buf); kfree(rq); kfree(pc); return -ENOMEM; } - memset (pc, 0, sizeof (idescsi_pc_t)); - memset (buf, 0, SCSI_SENSE_BUFFERSIZE); ide_init_drive_cmd(rq); rq->special = (char *) pc; pc->rq = rq; |