Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two minor fixes in the hisi_sas driver which only impact enterprise
style multi-expander and shared disk situations and no core changes"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id
scsi: hisi_sas: Use abort task set to reset SAS disks when discovered
+2
-2
+2
-2
drivers/scsi/hisi_sas/hisi_sas_main.c
+2
-2
drivers/scsi/hisi_sas/hisi_sas_main.c
···
704
704
int_to_scsilun(0, &lun);
705
705
706
706
while (retry-- > 0) {
707
-
rc = sas_clear_task_set(device, lun.scsi_lun);
707
+
rc = sas_abort_task_set(device, lun.scsi_lun);
708
708
if (rc == TMF_RESP_FUNC_COMPLETE) {
709
709
hisi_sas_release_task(hisi_hba, device);
710
710
break;
···
1316
1316
device->linkrate = phy->sas_phy.linkrate;
1317
1317
1318
1318
hisi_hba->hw->setup_itct(hisi_hba, sas_dev);
1319
-
} else
1319
+
} else if (!port->port_attached)
1320
1320
port->id = 0xff;
1321
1321
}
1322
1322
}