1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index de2337f255a7..c1b05a83d403 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -789,7 +789,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
                              int cmnd_size, int timeout, unsigned sense_bytes)
 {
         struct scsi_device *sdev = scmd->device;
-        struct scsi_driver *sdrv = scsi_cmd_to_driver(scmd);
         struct Scsi_Host *shost = sdev->host;
         DECLARE_COMPLETION_ONSTACK(done);
         unsigned long timeleft;
@@ -845,8 +844,11 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 
         scsi_eh_restore_cmnd(scmd, &ses);
 
-        if (sdrv && sdrv->eh_action)
-                rtn = sdrv->eh_action(scmd, cmnd, cmnd_size, rtn);
+        if (scmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
+                struct scsi_driver *sdrv = scsi_cmd_to_driver(scmd);
+                if (sdrv->eh_action)
+                        rtn = sdrv->eh_action(scmd, cmnd, cmnd_size, rtn);
+        }
 
         return rtn;
 }