---

yaml --- r: 177958 b: refs/heads/master c: 8257ec8 h: refs/heads/master v: v3
git-mirror · Dec 10, 2009 · cc7d6cf · cc7d6cf
1 parent 69fd3d7
commit cc7d6cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a61b8699c764cccf85ccbf489e1772b2950ba4c6
+refs/heads/master: 8257ec80ba5b333dedf3395acf90055075aeba94
diff --git a/trunk/drivers/scsi/pm8001/pm8001_sas.c b/trunk/drivers/scsi/pm8001/pm8001_sas.c
@@ -944,6 +944,8 @@ int pm8001_I_T_nexus_reset(struct domain_device *dev)
 
 	if (dev_is_sata(dev)) {
 		DECLARE_COMPLETION_ONSTACK(completion_setstate);
+		if (scsi_is_sas_phy_local(phy))
+			return 0;
 		rc = sas_phy_reset(phy, 1);
 		msleep(2000);
 		rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,