---

yaml
---
r: 316799
b: refs/heads/master
c: 361ee9c
h: refs/heads/master
i:
  316797: e2d02ef
  316795: 21669d2
  316791: 589f4c0
  316783: 6aba60d
  316767: 8aae97b
  316735: 3c3867f
  316671: a09113b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff08784b41e1ab5da6776411b7a8381fe942f2cc
+refs/heads/master: 361ee9c3f3839d6cbd306b5bd34292e0848ecfdc

trunk/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);
@@ -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;
 	}