From 0dd2f246f66e445330c2f1b1dfba5b0767a9ccb4 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Mon, 30 Jan 2012 22:53:51 -0800
Subject: [PATCH] --- yaml --- r: 293033 b: refs/heads/master c:
 16d3db1b298529e6aec4a4cf0f56225d9e0bc641 h: refs/heads/master i:   293031:
 93d76fe63681ecef0b2e3a6d24031303adfa969c v: v3

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

diff --git a/[refs] b/[refs]
index b4f6d90d06fc..0fd5d73e97ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26a2e68f816ebd736a0484ca293457b280af4ef1
+refs/heads/master: 16d3db1b298529e6aec4a4cf0f56225d9e0bc641
diff --git a/trunk/drivers/scsi/scsi_transport_sas.c b/trunk/drivers/scsi/scsi_transport_sas.c
index 7d69a25d2004..f7565fc4f0e3 100644
--- a/trunk/drivers/scsi/scsi_transport_sas.c
+++ b/trunk/drivers/scsi/scsi_transport_sas.c
@@ -615,6 +615,7 @@ do_sas_phy_reset(struct device *dev, size_t count, int hard_reset)
 	error = i->f->phy_reset(phy, hard_reset);
 	if (error)
 		return error;
+	phy->enabled = 1;
 	return count;
 };