From 811533b5b06e764fcd7164cd2554f6b55f38b18a Mon Sep 17 00:00:00 2001
From: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Date: Thu, 21 Jun 2012 23:36:10 -0700
Subject: [PATCH] --- yaml --- r: 316811 b: refs/heads/master c:
 b2311a287553af4dffaef224cdd6e3ddf6783312 h: refs/heads/master i:   316809:
 4dec652906451c785b0fab86ea64aa7bf5fb9753   316807:
 08f263b9afabc00f1c44b5e33c7ec3507d8eef29 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/scsi/libsas/sas_expander.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 203951aeb927..0e2cf834cfe7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e646ddd5faf707602dcb4b491412b72180da3b3
+refs/heads/master: b2311a287553af4dffaef224cdd6e3ddf6783312
diff --git a/trunk/drivers/scsi/libsas/sas_expander.c b/trunk/drivers/scsi/libsas/sas_expander.c
index caa0525d2523..af659cc8308c 100644
--- a/trunk/drivers/scsi/libsas/sas_expander.c
+++ b/trunk/drivers/scsi/libsas/sas_expander.c
@@ -2005,6 +2005,7 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)
 	u8 sas_addr[8];
 	int res;
 
+	memset(sas_addr, 0, 8);
 	res = sas_get_phy_attached_dev(dev, phy_id, sas_addr, &type);
 	switch (res) {
 	case SMP_RESP_NO_PHY:
@@ -2017,9 +2018,13 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)
 		return res;
 	case SMP_RESP_FUNC_ACC:
 		break;
+	case -ECOMM:
+		break;
+	default:
+		return res;
 	}
 
-	if (SAS_ADDR(sas_addr) == 0) {
+	if ((SAS_ADDR(sas_addr) == 0) || (res == -ECOMM)) {
 		phy->phy_state = PHY_EMPTY;
 		sas_unregister_devs_sas_addr(dev, phy_id, last);
 		return res;