diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:53:40 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:53:40 -0700 |
| commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
| tree | 2b226019e7b1344f05e44d79da956a5306d20780 /drivers/scsi/libsas/sas_port.c | |
| parent | e0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff) | |
| parent | e689cf0caf2d5ebcb300fb69887d35c0abdbdb97 (diff) | |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/libsas/sas_port.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_port.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c index 1398b714c018..d3c5297c6c89 100644 --- a/drivers/scsi/libsas/sas_port.c +++ b/drivers/scsi/libsas/sas_port.c @@ -69,7 +69,7 @@ static void sas_resume_port(struct asd_sas_phy *phy) continue; } - if (dev->dev_type == EDGE_DEV || dev->dev_type == FANOUT_DEV) { + if (dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE) { dev->ex_dev.ex_change_count = -1; for (i = 0; i < dev->ex_dev.num_phys; i++) { struct ex_phy *phy = &dev->ex_dev.ex_phy[i]; |