Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 835831c5 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

scsi: ses: use scsi_is_sas_rphy instead of is_sas_attached 



Use scsi_is_sas_rphy() instead of is_sas_attached() to decide whether we
should obtain the SAS address from a scsi device or not. This will
prevent us from tripping on the BUG_ON() in sas_sdev_to_rdev() if the
rphy isn't attached to the SAS transport class, like it is with hpsa's
logical devices.

Fixes: 3f8d6f2a ('ses: fix discovery of SATA devices in SAS enclosures')
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarJames E.J. Bottomley <jejb@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c1a23f6d

drivers/scsi/ses.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {