diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-05-15 07:59:29 -0400 |
|---|---|---|
| committer | Tejun Heo <htejun@gmail.com> | 2006-05-15 07:59:29 -0400 |
| commit | c17ea20d9a689d7335e97e09354865cdd9f873e1 (patch) | |
| tree | 74b04b022513b66b5a84977b15296c1d8df97674 /drivers/scsi/libata-bmdma.c | |
| parent | 12436c30f4808e00fa008c6787c609bc6ae216ba (diff) | |
[PATCH] libata: fix irq-pio merge
* kill ata_poll_qc_complete() and implement/use ata_hsm_qc_complete()
which completes qcs in new EH compliant manner from HSM
* don't print error message from ata_hsm_move(). it's responsibility
of EH.
* kill ATA_FLAG_NOINTR usage in bmdma EH
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/scsi/libata-bmdma.c')
| -rw-r--r-- | drivers/scsi/libata-bmdma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/libata-bmdma.c b/drivers/scsi/libata-bmdma.c index 49eff18a67e3..6d30d2c52960 100644 --- a/drivers/scsi/libata-bmdma.c +++ b/drivers/scsi/libata-bmdma.c | |||
| @@ -726,7 +726,6 @@ void ata_bmdma_drive_eh(struct ata_port *ap, ata_reset_fn_t softreset, | |||
| 726 | /* reset PIO HSM and stop DMA engine */ | 726 | /* reset PIO HSM and stop DMA engine */ |
| 727 | spin_lock_irqsave(&host_set->lock, flags); | 727 | spin_lock_irqsave(&host_set->lock, flags); |
| 728 | 728 | ||
| 729 | ap->flags &= ~ATA_FLAG_NOINTR; | ||
| 730 | ap->hsm_task_state = HSM_ST_IDLE; | 729 | ap->hsm_task_state = HSM_ST_IDLE; |
| 731 | 730 | ||
| 732 | if (qc && (qc->tf.protocol == ATA_PROT_DMA || | 731 | if (qc && (qc->tf.protocol == ATA_PROT_DMA || |