diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 19:57:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 19:57:25 -0800 |
commit | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (patch) | |
tree | 2465db413b527b65f2000aa7aa33d0f962ca3479 /drivers/scsi | |
parent | b01a55a865eeac0371f1a73d36b134d23d938e1a (diff) | |
parent | 07203f6471a11f4eda48acbe528c0ce4704ad42c (diff) | |
download | kernel_samsung_smdk4412-3b44f137b9a846c5452d9e6e1271b79b1dbcc942.zip kernel_samsung_smdk4412-3b44f137b9a846c5452d9e6e1271b79b1dbcc942.tar.gz kernel_samsung_smdk4412-3b44f137b9a846c5452d9e6e1271b79b1dbcc942.tar.bz2 |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/ide-scsi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index c888af4..3553da0 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c @@ -395,6 +395,7 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs) int log = test_bit(IDESCSI_LOG_CMD, &scsi->log); struct Scsi_Host *host; u8 *scsi_buf; + int errors = rq->errors; unsigned long flags; if (!(rq->flags & (REQ_SPECIAL|REQ_SENSE))) { @@ -421,11 +422,11 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs) printk (KERN_WARNING "ide-scsi: %s: timed out for %lu\n", drive->name, pc->scsi_cmd->serial_number); pc->scsi_cmd->result = DID_TIME_OUT << 16; - } else if (rq->errors >= ERROR_MAX) { + } else if (errors >= ERROR_MAX) { pc->scsi_cmd->result = DID_ERROR << 16; if (log) printk ("ide-scsi: %s: I/O error for %lu\n", drive->name, pc->scsi_cmd->serial_number); - } else if (rq->errors) { + } else if (errors) { if (log) printk ("ide-scsi: %s: check condition for %lu\n", drive->name, pc->scsi_cmd->serial_number); if (!idescsi_check_condition(drive, rq)) |