Skip to content

Commit

Permalink
scsi: ses: use scsi_is_sas_rphy instead of is_sas_attached
Browse files Browse the repository at this point in the history
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: 3f8d6f2 ('ses: fix discovery of SATA devices in SAS enclosures')
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
Johannes Thumshirn authored and Martin K. Petersen committed Aug 19, 2016
1 parent c1a23f6 commit 835831c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/scsi/ses.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 835831c

Please sign in to comment.