1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c
index e99a0eba42fa..d2309afe8c49 100644
--- a/drivers/scsi/cxlflash/superpipe.c
+++ b/drivers/scsi/cxlflash/superpipe.c
@@ -1787,12 +1787,21 @@ static int cxlflash_disk_verify(struct scsi_device *sdev,
          * inquiry (i.e. the Unit attention is due to the WWN changing).
          */
         if (verify->hint & DK_CXLFLASH_VERIFY_HINT_SENSE) {
+                /* Can't hold mutex across process_sense/read_cap16,
+                 * since we could have an intervening EEH event.
+                 */
+                ctxi->unavail = true;
+                mutex_unlock(&ctxi->mutex);
                 rc = process_sense(sdev, verify);
                 if (unlikely(rc)) {
                         dev_err(dev, "%s: Failed to validate sense data (%d)\n",
                                 __func__, rc);
+                        mutex_lock(&ctxi->mutex);
+                        ctxi->unavail = false;
                         goto out;
                 }
+                mutex_lock(&ctxi->mutex);
+                ctxi->unavail = false;
         }
 
         switch (gli->mode) {