From 033e92b9ee606bbc571150185d4c2c834f488f8a Mon Sep 17 00:00:00 2001 From: "Moore, Eric" Date: Thu, 13 Apr 2006 16:08:17 -0600 Subject: [PATCH] --- yaml --- r: 25827 b: refs/heads/master c: 3c0c25b97c7d020ef07f6366cf1d668a8e980c7c h: refs/heads/master i: 25825: 690ff8ed4f795db84ab7fb790214985febcbc0d3 25823: 58be248eaf9673b9da9c69c6ad81759ae5cd4ac7 v: v3 --- [refs] | 2 +- trunk/drivers/message/fusion/mptsas.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 857d3f5f01b2..ee74bc4d7d48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e08dcb39c6b95ec84fc8bad97d5bdce879b76c9 +refs/heads/master: 3c0c25b97c7d020ef07f6366cf1d668a8e980c7c diff --git a/trunk/drivers/message/fusion/mptsas.c b/trunk/drivers/message/fusion/mptsas.c index 010d4a39269b..e9716b10acea 100644 --- a/trunk/drivers/message/fusion/mptsas.c +++ b/trunk/drivers/message/fusion/mptsas.c @@ -366,7 +366,15 @@ mptsas_sas_enclosure_pg0(MPT_ADAPTER *ioc, struct mptsas_enclosure *enclosure, static int mptsas_slave_configure(struct scsi_device *sdev) { - sas_read_port_mode_page(sdev); + struct Scsi_Host *host = sdev->host; + MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)host->hostdata; + + /* + * RAID volumes placed beyond the last expected port. + * Ignore sending sas mode pages in that case.. + */ + if (sdev->channel < hd->ioc->num_ports) + sas_read_port_mode_page(sdev); return mptscsih_slave_configure(sdev); }