diff --git a/[refs] b/[refs]
index 16bb53e7c6c9..770cf0bae7de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d87fa38e70853a9607dc34a02d15cf5f149f49f2
+refs/heads/master: 0a1b622ef495d8ebba9ad8982414c6661c16b604
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
index d4b80b64342c..6285257a890d 100644
--- a/trunk/drivers/scsi/libata-eh.c
+++ b/trunk/drivers/scsi/libata-eh.c
@@ -334,6 +334,7 @@ void ata_port_wait_eh(struct ata_port *ap)
 		schedule();
 		spin_lock_irqsave(&ap->host_set->lock, flags);
 	}
+	finish_wait(&ap->eh_wait_q, &wait);
 
 	spin_unlock_irqrestore(&ap->host_set->lock, flags);