diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:36:14 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:36:14 -0500 |
| commit | 7dfb869c8e45e5863534f38fdac990829b22964a (patch) | |
| tree | f36bbdba46b022356d05ac26d5073e395d2f8abd /drivers/scsi/sata_mv.c | |
| parent | 628e386e27674906326455f01d87878a5f0cbce7 (diff) | |
| parent | 11a56d2439259892319df81cf1582687d7e7fde5 (diff) | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index e9bee1210c23..68d17791896f 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -1865,7 +1865,7 @@ static void mv_eng_timeout(struct ata_port *ap) | |||
| 1865 | */ | 1865 | */ |
| 1866 | spin_lock_irqsave(&ap->host_set->lock, flags); | 1866 | spin_lock_irqsave(&ap->host_set->lock, flags); |
| 1867 | qc->scsidone = scsi_finish_command; | 1867 | qc->scsidone = scsi_finish_command; |
| 1868 | qc->err_mask |= AC_ERR_OTHER; | 1868 | qc->err_mask |= AC_ERR_TIMEOUT; |
| 1869 | ata_qc_complete(qc); | 1869 | ata_qc_complete(qc); |
| 1870 | spin_unlock_irqrestore(&ap->host_set->lock, flags); | 1870 | spin_unlock_irqrestore(&ap->host_set->lock, flags); |
| 1871 | } | 1871 | } |