diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2012-09-13 08:26:10 (GMT) |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-13 08:26:10 (GMT) |
| commit | 1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (patch) | |
| tree | c4ecdf7a4199bc20adcef950e9d5a38b9a6dc392 /drivers/scsi/isci/host.c | |
| parent | 0bd1189e239c76eb3a50e458548fbe7e4a5dfff1 (diff) | |
| parent | 6734092e66011def7875bd67beef889d0fee1cc9 (diff) | |
| download | linux-fsl-qoriq-1c4cf1d5845b59cdcbfad8e67272cf5b219ab062.tar.xz | |
Merge tag 'isci-for-3.6' into for-next
isci update for 3.6
1/ Fix the workaround for drives that have a slow response to COMSAS.
Drives with this problem intermittently take a long time to be
identified, or fail to be identified altogether.
2/ A minor fix for the efi variable code failure path
3/ A handful of smatch fixups from Dan Carpenter
Diffstat (limited to 'drivers/scsi/isci/host.c')
| -rw-r--r-- | drivers/scsi/isci/host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index 45385f5..b425ed5 100644 --- a/drivers/scsi/isci/host.c +++ b/drivers/scsi/isci/host.c @@ -1973,7 +1973,7 @@ static void sci_controller_afe_initialization(struct isci_host *ihost) } for (phy_id = 0; phy_id < SCI_MAX_PHYS; phy_id++) { - struct scu_afe_transceiver *xcvr = &afe->scu_afe_xcvr[phy_id]; + struct scu_afe_transceiver __iomem *xcvr = &afe->scu_afe_xcvr[phy_id]; const struct sci_phy_oem_params *oem_phy = &oem->phys[phy_id]; int cable_length_long = is_long_cable(phy_id, cable_selection_mask); |