X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fscsi%2Flibata-core.c;h=a28569d0081dfe6e052f63573e4147182c43dfe3;hb=41ade50c4eff9477e6aef6b15e84673c6758ec0d;hp=714b42bad935739af2e3aef58b0856215c029c1b;hpb=c39f5ebe0a542caab30c88e60623709c7bc6fe30;p=linux-2.6

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 714b42bad9..a28569d008 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -962,6 +962,8 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,
 	spin_unlock_irqrestore(&ap->host_set->lock, flags);
 
 	if (!wait_for_completion_timeout(&wait, ATA_TMOUT_INTERNAL)) {
+		ata_port_flush_task(ap);
+
 		spin_lock_irqsave(&ap->host_set->lock, flags);
 
 		/* We're racing with irq here.  If we lose, the