Merge SCSI misc branch into isci-for-3.6 tag

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / isci / host.c

diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index ab026a50ace3ed93c92779c4b076f502c4f44785..b0afa4486158f7f37537c486853791427c7102f7 100644 (file)
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1981,7 +1981,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);