2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 0621238fac4a..37790c073c28 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5773,7 +5773,8 @@ static int ipr_queuecommand_lck(struct scsi_cmnd *scsi_cmd,
                 }
 
                 ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_LINK_DESC;
-                ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_DELAY_AFTER_RST;
+                if (ipr_is_gscsi(res))
+                        ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_DELAY_AFTER_RST;
                 ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_ALIGNED_BFR;
                 ioarcb->cmd_pkt.flags_lo |= ipr_get_task_attributes(scsi_cmd);
         }
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 13f425fb8851..11b2dac71ab3 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -474,7 +474,7 @@ struct ipr_cmd_pkt {
 
         u8 flags_lo;
 #define IPR_FLAGS_LO_ALIGNED_BFR                0x20
-#define IPR_FLAGS_LO_DELAY_AFTER_RST    0x10
+#define IPR_FLAGS_LO_DELAY_AFTER_RST            0x10
 #define IPR_FLAGS_LO_UNTAGGED_TASK              0x00
 #define IPR_FLAGS_LO_SIMPLE_TASK                0x02
 #define IPR_FLAGS_LO_ORDERED_TASK               0x04