3 files changed, 10 insertions, 8 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index f8d2ae30128..c05092fd3a9 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1341,7 +1341,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
                           (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
                           dev->supplement_adapter_info.VpdInfo.Tsid);
                 }
-                if (!aac_check_reset || ((aac_check_reset != 1) &&
+                if (!aac_check_reset || ((aac_check_reset == 1) &&
                   (dev->supplement_adapter_info.SupportedOptions2 &
                   AAC_OPTION_IGNORE_RESET))) {
                         printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",
@@ -1379,13 +1379,14 @@ int aac_get_adapter_info(struct aac_dev* dev)
 
         if (nondasd != -1)
                 dev->nondasd_support = (nondasd!=0);
-        if(dev->nondasd_support != 0) {
+        if (dev->nondasd_support && !dev->in_reset)
                 printk(KERN_INFO "%s%d: Non-DASD support enabled.\n",dev->name, dev->id);
-        }
 
         dev->dac_support = 0;
         if( (sizeof(dma_addr_t) > 4) && (dev->adapter_info.options & AAC_OPT_SGMAP_HOST64)){
-                printk(KERN_INFO "%s%d: 64bit support enabled.\n", dev->name, dev->id);
+                if (!dev->in_reset)
+                        printk(KERN_INFO "%s%d: 64bit support enabled.\n",
+                                dev->name, dev->id);
                 dev->dac_support = 1;
         }
 
@@ -1395,8 +1396,9 @@ int aac_get_adapter_info(struct aac_dev* dev)
         if(dev->dac_support != 0) {
                 if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&
                         !pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {
-                        printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
-                                dev->name, dev->id);
+                        if (!dev->in_reset)
+                                printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
+                                        dev->name, dev->id);
                 } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
                         !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
                         printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 81b36923e0e..47434499e82 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1458,7 +1458,7 @@ int aac_check_health(struct aac_dev * aac)
 
         printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);
 
-        if (!aac_check_reset || ((aac_check_reset != 1) &&
+        if (!aac_check_reset || ((aac_check_reset == 1) &&
                 (aac->supplement_adapter_info.SupportedOptions2 &
                         AAC_OPTION_IGNORE_RESET)))
                 goto out;
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 7232e7326de..fdfbad0903f 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -641,7 +641,7 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
            AAC_OPTION_MU_RESET) &&
           aac_check_reset &&
           ((aac_check_reset != 1) ||
-           (aac->supplement_adapter_info.SupportedOptions2 &
+           !(aac->supplement_adapter_info.SupportedOptions2 &
             AAC_OPTION_IGNORE_RESET)))
                 aac_reset_adapter(aac, 2); /* Bypass wait for command quiesce */
         return SUCCESS; /* Cause an immediate retry of the command with a ten second delay after successful tur */