From: Ewan D. Milne <emilne@redhat.com>
Date: Mon, 9 Jan 2017 21:33:36 +0000 (-0500)
Subject: scsi: ses: Fix SAS device detection in enclosure
X-Git-Tag: v4.14-rc1~1553^2~3^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9373eba6cfae48911b977d14323032cd5d161aae;p=platform%2Fkernel%2Flinux-rpi3.git

scsi: ses: Fix SAS device detection in enclosure

The call to scsi_is_sas_rphy() needs to be made on the SAS end_device,
not on the SCSI device.

Fixes: 835831c57e9b ("ses: use scsi_is_sas_rphy instead of is_sas_attached")
Signed-off-by: Ewan D. Milne <emilne@redhat.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 8c9a35c..50adabb 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -587,7 +587,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,
 
 	ses_enclosure_data_process(edev, to_scsi_device(edev->edev.parent), 0);
 
-	if (scsi_is_sas_rphy(&sdev->sdev_gendev))
+	if (scsi_is_sas_rphy(sdev->sdev_target->dev.parent))
 		efd.addr = sas_get_address(sdev);
 
 	if (efd.addr) {