1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index e42a479ce64a..d67058f80816 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -454,17 +454,17 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
         printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n", 
                                         AAC_DRIVERNAME);
         aac = (struct aac_dev *)host->hostdata;
-        if (aac_adapter_check_health(aac)) {
-                printk(KERN_ERR "%s: Host adapter appears dead\n", 
-                                AAC_DRIVERNAME);
-                return -ENODEV;
-        }
+
+        if ((count = aac_check_health(aac)))
+                return count;
         /*
          * Wait for all commands to complete to this specific
          * target (block maximum 60 seconds).
          */
         for (count = 60; count; --count) {
-                int active = 0;
+                int active = aac->in_reset;
+
+                if (active == 0)
                 __shost_for_each_device(dev, host) {
                         spin_lock_irqsave(&dev->list_lock, flags);
                         list_for_each_entry(command, &dev->cmd_list, list) {
@@ -933,7 +933,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         else
                 shost->max_channel = 0;
 
-        aac_get_config_status(aac);
+        aac_get_config_status(aac, 0);
         aac_get_containers(aac);
         list_add(&aac->entry, insert);
 
@@ -1013,6 +1013,10 @@ static void __devexit aac_remove_one(struct pci_dev *pdev)
         list_del(&aac->entry);
         scsi_host_put(shost);
         pci_disable_device(pdev);
+        if (list_empty(&aac_devices)) {
+                unregister_chrdev(aac_cfg_major, "aac");
+                aac_cfg_major = -1;
+        }
 }
 
 static struct pci_driver aac_pci_driver = {