From 6fc4506243c291094d49d6303d5892ed8cb2a100 Mon Sep 17 00:00:00 2001
From: Mark Haverkamp <markh@osdl.org>
Date: Tue, 21 Nov 2006 10:40:08 -0800
Subject: [PATCH] --- yaml --- r: 42453 b: refs/heads/master c:
 33524b70e8f3dd55a4ba78ad81742c7814e7b0ed h: refs/heads/master i:   42451:
 b19e4b3cd907580a10093668ee7fe2a181d52297 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/aacraid/commsup.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2ac92ef25f2a..1e9462116869 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51d23da95c3b71ce70587af8fc8244a05722c191
+refs/heads/master: 33524b70e8f3dd55a4ba78ad81742c7814e7b0ed
diff --git a/trunk/drivers/scsi/aacraid/commsup.c b/trunk/drivers/scsi/aacraid/commsup.c
index 19e42ac07cb2..0fd462a876f9 100644
--- a/trunk/drivers/scsi/aacraid/commsup.c
+++ b/trunk/drivers/scsi/aacraid/commsup.c
@@ -518,6 +518,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
 			 */
 			unsigned long count = 36000000L; /* 3 minutes */
 			while (down_trylock(&fibptr->event_wait)) {
+				int blink;
 				if (--count == 0) {
 					spin_lock_irqsave(q->lock, qflags);
 					q->numpending--;
@@ -530,6 +531,14 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
 					}
 					return -ETIMEDOUT;
 				}
+				if ((blink = aac_adapter_check_health(dev)) > 0) {
+					if (wait == -1) {
+	        				printk(KERN_ERR "aacraid: aac_fib_send: adapter blinkLED 0x%x.\n"
+						  "Usually a result of a serious unrecoverable hardware problem\n",
+						  blink);
+					}
+					return -EFAULT;
+				}
 				udelay(5);
 			}
 		} else if (down_interruptible(&fibptr->event_wait)) {