1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 47ea111d5ace..6b2553dae489 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3182,10 +3182,12 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,
                         rc = -EINVAL;
         }
 
-        if (rc == 0)
+        if (rc == 0) {
                 ata_port_schedule_eh(ap);
-
-        spin_unlock_irqrestore(ap->lock, flags);
+                spin_unlock_irqrestore(ap->lock, flags);
+                ata_port_wait_eh(ap);
+        } else
+                spin_unlock_irqrestore(ap->lock, flags);
 
         return rc;
 }