diff options
| author | Jack Wang <jack_wang@usish.com> | 2010-10-06 16:05:35 +0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-11 17:40:00 -0500 |
| commit | 2bc72c91ea7e104b0e40151543d135b933a12e93 (patch) | |
| tree | 50e5d393a70882ed513dbc402b82c1f1d2216fcc /drivers/scsi/libsas/sas_expander.c | |
| parent | 526f7c7950bbf1271e59177d70d74438c2ef96de (diff) | |
| download | linux-2bc72c91ea7e104b0e40151543d135b933a12e93.tar.gz linux-2bc72c91ea7e104b0e40151543d135b933a12e93.tar.bz2 linux-2bc72c91ea7e104b0e40151543d135b933a12e93.zip | |
[SCSI] libsas: fix bug for vacant phy
This patch fix bug reported by Chuck. And this new version incorporate comments
from Hannes. Please consider to include it into mainline.
Signed-off-by: Jack Wang <jack_wang@usish.com>
Signed-off-by: Lindar Liu <lindar_liu@usish.com>
Tested-by: Chuck Tuffli <Chuck_Tuffli@pmc-sierra.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/libsas/sas_expander.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 61d81f858a5a..505ffe358293 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -175,10 +175,10 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, switch (resp->result) { case SMP_RESP_PHY_VACANT: phy->phy_state = PHY_VACANT; - return; + break; default: phy->phy_state = PHY_NOT_PRESENT; - return; + break; case SMP_RESP_FUNC_ACC: phy->phy_state = PHY_EMPTY; /* do not know yet */ break; @@ -209,7 +209,10 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, phy->phy->negotiated_linkrate = phy->linkrate; if (!rediscover) - sas_phy_add(phy->phy); + if (sas_phy_add(phy->phy)) { + sas_phy_free(phy->phy); + return; + } SAS_DPRINTK("ex %016llx phy%02d:%c attached: %016llx\n", SAS_ADDR(dev->sas_addr), phy->phy_id, |