diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 0e8601aa877a83e35dc1305ffa452a1c0c4eeffa..8c9a35c91705e42fcbc07e3721d0522f96d496dc 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 (is_sas_attached(sdev))
+	if (scsi_is_sas_rphy(&sdev->sdev_gendev))
 		efd.addr = sas_get_address(sdev);
 
 	if (efd.addr) {