diff options
Diffstat (limited to 'drivers/scsi/ide-scsi.c')
-rw-r--r-- | drivers/scsi/ide-scsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index f04f3289938d..c888af4a4562 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
@@ -331,9 +331,9 @@ static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_co | |||
331 | rq = kmalloc (sizeof (struct request), GFP_ATOMIC); | 331 | rq = kmalloc (sizeof (struct request), GFP_ATOMIC); |
332 | buf = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC); | 332 | buf = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC); |
333 | if (pc == NULL || rq == NULL || buf == NULL) { | 333 | if (pc == NULL || rq == NULL || buf == NULL) { |
334 | if (pc) kfree(pc); | 334 | kfree(buf); |
335 | if (rq) kfree(rq); | 335 | kfree(rq); |
336 | if (buf) kfree(buf); | 336 | kfree(pc); |
337 | return -ENOMEM; | 337 | return -ENOMEM; |
338 | } | 338 | } |
339 | memset (pc, 0, sizeof (idescsi_pc_t)); | 339 | memset (pc, 0, sizeof (idescsi_pc_t)); |
@@ -949,8 +949,8 @@ static int idescsi_queue (struct scsi_cmnd *cmd, | |||
949 | spin_lock_irq(host->host_lock); | 949 | spin_lock_irq(host->host_lock); |
950 | return 0; | 950 | return 0; |
951 | abort: | 951 | abort: |
952 | if (pc) kfree (pc); | 952 | kfree (pc); |
953 | if (rq) kfree (rq); | 953 | kfree (rq); |
954 | cmd->result = DID_ERROR << 16; | 954 | cmd->result = DID_ERROR << 16; |
955 | done(cmd); | 955 | done(cmd); |
956 | return 0; | 956 | return 0; |