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_sil24.c | |
| parent | 628e386e27674906326455f01d87878a5f0cbce7 (diff) | |
| parent | 11a56d2439259892319df81cf1582687d7e7fde5 (diff) | |
| download | kernel_samsung_espresso10-7dfb869c8e45e5863534f38fdac990829b22964a.zip kernel_samsung_espresso10-7dfb869c8e45e5863534f38fdac990829b22964a.tar.gz kernel_samsung_espresso10-7dfb869c8e45e5863534f38fdac990829b22964a.tar.bz2 | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/sata_sil24.c')
| -rw-r--r-- | drivers/scsi/sata_sil24.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index 9231301..fb59012 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c @@ -653,7 +653,7 @@ static void sil24_eng_timeout(struct ata_port *ap) */ printk(KERN_ERR "ata%u: command timeout\n", ap->id); qc->scsidone = scsi_finish_command; - qc->err_mask |= AC_ERR_OTHER; + qc->err_mask |= AC_ERR_TIMEOUT; ata_qc_complete(qc); sil24_reset_controller(ap); |