1 files changed, 13 insertions, 3 deletions

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 0d279c445a30..7199534cd07d 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1089,8 +1089,17 @@ static struct scsi_host_template aac_driver_template = {
 
 static void __aac_shutdown(struct aac_dev * aac)
 {
-        if (aac->aif_thread)
+        if (aac->aif_thread) {
+                int i;
+                /* Clear out events first */
+                for (i = 0; i < (aac->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB); i++) {
+                        struct fib *fib = &aac->fibs[i];
+                        if (!(fib->hw_fib_va->header.XferState & cpu_to_le32(NoResponseExpected | Async)) &&
+                            (fib->hw_fib_va->header.XferState & cpu_to_le32(ResponseExpected)))
+                                up(&fib->event_wait);
+                }
                 kthread_stop(aac->thread);
+        }
         aac_send_shutdown(aac);
         aac_adapter_disable_int(aac);
         free_irq(aac->pdev->irq, aac);
@@ -1145,11 +1154,11 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
                 goto out_disable_pdev;
 
         shost->irq = pdev->irq;
-        shost->base = pci_resource_start(pdev, 0);
         shost->unique_id = unique_id;
         shost->max_cmd_len = 16;
 
         aac = (struct aac_dev *)shost->hostdata;
+        aac->base_start = pci_resource_start(pdev, 0);
         aac->scsi_host_ptr = shost;
         aac->pdev = pdev;
         aac->name = aac_driver_template.name;
@@ -1157,7 +1166,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         aac->cardtype = index;
         INIT_LIST_HEAD(&aac->entry);
 
-        aac->fibs = kmalloc(sizeof(struct fib) * (shost->can_queue + AAC_NUM_MGT_FIB), GFP_KERNEL);
+        aac->fibs = kzalloc(sizeof(struct fib) * (shost->can_queue + AAC_NUM_MGT_FIB), GFP_KERNEL);
         if (!aac->fibs)
                 goto out_free_host;
         spin_lock_init(&aac->fib_lock);
@@ -1191,6 +1200,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         if (IS_ERR(aac->thread)) {
                 printk(KERN_ERR "aacraid: Unable to create command thread.\n");
                 error = PTR_ERR(aac->thread);
+                aac->thread = NULL;
                 goto out_deinit;
         }