Clearing IRQ from ata_sff_error_handler() is necessary only when the port is gonna be thawed before performing EH actions and some controllers don't like being accessed after certain fail modes until they're reset. Clear IRQ iff the port is being thawed. Also, remove unnecessary ata_sff_sync() while at it. Signed-off-by: Tejun Heo <tj@xxxxxxxxxx> --- s/clear/cleared/. git tree is updated too. Thanks. drivers/ata/libata-sff.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Index: work/drivers/ata/libata-sff.c =================================================================== --- work.orig/drivers/ata/libata-sff.c +++ work/drivers/ata/libata-sff.c @@ -2119,11 +2119,13 @@ void ata_sff_error_handler(struct ata_po } ap->ops->bmdma_stop(qc); - } - ata_sff_sync(ap); /* FIXME: We don't need this */ - ap->ops->sff_check_status(ap); - ap->ops->sff_irq_clear(ap); + /* if we're gonna thaw, make sure IRQ is cleared */ + if (thaw) { + ap->ops->sff_check_status(ap); + ap->ops->sff_irq_clear(ap); + } + } spin_unlock_irqrestore(ap->lock, flags); -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html