1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index 5b38f2f963e0..0a1577327d61 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -236,18 +236,12 @@ void isci_port_link_up(
 
                 BUG_ON(call_status != SCI_SUCCESS);
 
-                memcpy(isci_phy->frame_rcvd.aif,
-                       &(sas_phy_properties.received_iaf),
-                       sizeof(struct sci_sas_identify_address_frame));
-
-                isci_phy->sas_phy.frame_rcvd_size
-                        = sizeof(struct sci_sas_identify_address_frame);
+                isci_phy->frame_rcvd.iaf = sas_phy_properties.rcvd_iaf;
+                isci_phy->sas_phy.frame_rcvd_size = sizeof(struct sas_identify_frame);
 
                 /* Copy the attached SAS address from the IAF */
                 memcpy(isci_phy->sas_phy.attached_sas_addr,
-                       ((struct sas_identify_frame *)
-                        (&isci_phy->frame_rcvd.aif))->sas_addr,
-                       SAS_ADDR_SIZE);
+                       isci_phy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE);
 
         } else {
                 dev_err(&isci_host->pdev->dev, "%s: unkown target\n", __func__);