From cc7d6cf8e09e1534f030d86239a5088597a92500 Mon Sep 17 00:00:00 2001 From: jack wang Date: Mon, 7 Dec 2009 17:23:05 +0800 Subject: [PATCH] --- yaml --- r: 177958 b: refs/heads/master c: 8257ec80ba5b333dedf3395acf90055075aeba94 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/pm8001/pm8001_sas.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b1e6ea03790e..c0b2d2f24fd7 100644 --- 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 index c86f92160c7a..e3d4f385dcce 100644 --- 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 ,