Merge tag 'for-linus-20170904' of git://git.infradead.org/linux-mtd

[linux-2.6-microblaze.git] / drivers / scsi / aacraid / commsup.c

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 1c617cc..dfe8e70 100644 (file)
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -770,7 +770,8 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
                /* bit1 of request_id must be 0 */
                hbacmd->request_id =
                        cpu_to_le32((((u32)(fibptr - dev->fibs)) << 2) + 1);
-       } else
+               fibptr->flags |= FIB_CONTEXT_FLAG_SCSI_CMD;
+       } else if (command != HBA_IU_TYPE_SCSI_TM_REQ)
                return -EINVAL;