From d4c6f3201d584cb6685d595b494701880d0f7820 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 21 Dec 2011 15:19:56 -0800
Subject: [PATCH] --- yaml --- r: 293005 b: refs/heads/master c:
 3a9c5560f677690f65038f399f4f598c79b83186 h: refs/heads/master i:   293003:
 5ffa99b5add84efe587a17552524cd40a7844e7a v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/scsi/libsas/sas_expander.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1d8c0a49f83d..16b42ec24951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0508c2f3b701f3cd8ed52b2a4abbb2a670f69ce2
+refs/heads/master: 3a9c5560f677690f65038f399f4f598c79b83186
diff --git a/trunk/drivers/scsi/libsas/sas_expander.c b/trunk/drivers/scsi/libsas/sas_expander.c
index 7701ab588404..6fb1f3afd1e0 100644
--- a/trunk/drivers/scsi/libsas/sas_expander.c
+++ b/trunk/drivers/scsi/libsas/sas_expander.c
@@ -74,6 +74,11 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
 
 	mutex_lock(&dev->ex_dev.cmd_mutex);
 	for (retry = 0; retry < 3; retry++) {
+		if (test_bit(SAS_DEV_GONE, &dev->state)) {
+			res = -ECOMM;
+			break;
+		}
+
 		task = sas_alloc_task(GFP_KERNEL);
 		if (!task) {
 			res = -ENOMEM;