1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 528d52beaa1c..01440782feb2 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1221,7 +1221,12 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
         /*
          * At this point, all outstanding requests in the adapter
          * should have been flushed out and return to us
+         * There is a potential race here where the host may be in
+         * the process of responding when we return from here.
+         * Just wait for all in-transit packets to be accounted for
+         * before we return from here.
          */
+        storvsc_wait_to_drain(stor_device);
 
         return SUCCESS;
 }