diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 17:50:26 (GMT) |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 17:50:26 (GMT) |
| commit | 383f9749505cef0a30dbd7109db7fe469aa64753 (patch) | |
| tree | 9e88d648396ac99a90d12ccf5471d001e87c65ae /drivers/scsi/ide-scsi.c | |
| parent | f093182d313edde9b1f86dbdaf40ba4da2dbd0e7 (diff) | |
| parent | 3da8b713da723e78a03f0404beedf3cc6f4f860b (diff) | |
| download | linux-fsl-qoriq-383f9749505cef0a30dbd7109db7fe469aa64753.tar.xz | |
Merge by hand (conflicts between pending drivers and kfree cleanups)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/ide-scsi.c')
| -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)) |