diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 15:47:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 15:47:45 -0500 |
| commit | 84d891d6727c17832c79ec96d3d107a87d857978 (patch) | |
| tree | a189a4d00c1387e409e2f9808c72c8088728c33b /drivers/message/fusion/mptsas.c | |
| parent | 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 (diff) | |
| parent | 7676f83aeb774e7a3abe6af06ec92b29488b5b79 (diff) | |
| download | op-kernel-dev-84d891d6727c17832c79ec96d3d107a87d857978.zip op-kernel-dev-84d891d6727c17832c79ec96d3d107a87d857978.tar.gz | |
Merge ../scsi-rc-fixes-2.6
Conflicts:
include/scsi/scsi_devinfo.h
Same number for two BLIST flags: BLIST_MAX_512 and BLIST_ATTACH_PQ3
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptsas.c')
| -rw-r--r-- | drivers/message/fusion/mptsas.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 010d4a3..e9716b10 100644 --- a/drivers/message/fusion/mptsas.c +++ b/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); } |
