1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 22ecacffeca6..598d6efae53e 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -413,13 +413,16 @@ static int aac_slave_configure(struct scsi_device *sdev)
         if (chn < AAC_MAX_BUSES && tid < AAC_MAX_TARGETS && aac->sa_firmware) {
                 devtype = aac->hba_map[chn][tid].devtype;
 
-                if (devtype == AAC_DEVTYPE_NATIVE_RAW)
+                if (devtype == AAC_DEVTYPE_NATIVE_RAW) {
                         depth = aac->hba_map[chn][tid].qd_limit;
-                else if (devtype == AAC_DEVTYPE_ARC_RAW)
+                        set_timeout = 1;
+                        goto common_config;
+                }
+                if (devtype == AAC_DEVTYPE_ARC_RAW) {
                         set_qd_dev_type = true;
-
-                set_timeout = 1;
-                goto common_config;
+                        set_timeout = 1;
+                        goto common_config;
+                }
         }
 
         if (aac->jbod && (sdev->type == TYPE_DISK))