diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index d4b80b64342c..6285257a890d 100644
--- a/drivers/scsi/libata-eh.c
+++ b/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);