From fae33c4063bb23c93f863f013e57ab4220fa8c52 Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Wed, 1 Aug 2007 23:46:45 +0200 Subject: [PATCH] --- yaml --- r: 63547 b: refs/heads/master c: 41ead3c918f48710ca1e03eb7b770eabcbbd260b h: refs/heads/master i: 63545: 6763872db8ab3a75175e57d394aa49ba33d56dba 63543: e1b29566a7846479ef3552ae7faa8c86e52e2dbb v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ide-scsi.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fc542633972b..c2c2f09e85a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc60d8baa35c995bf8c40a9730b894993ddb43b9 +refs/heads/master: 41ead3c918f48710ca1e03eb7b770eabcbbd260b diff --git a/trunk/drivers/scsi/ide-scsi.c b/trunk/drivers/scsi/ide-scsi.c index bb90df8bdce4..1cc01acc2808 100644 --- a/trunk/drivers/scsi/ide-scsi.c +++ b/trunk/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;