Commit 8e768130 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 34cbf89a f58c8970

drivers/scsi/hisi_sas/hisi_sas_main.c

+2 −2
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int hisi_sas_init_device(struct domain_device *device) 
		int_to_scsilun(0, &lun);



		while (retry-- > 0) {

			rc = sas_clear_task_set(device, lun.scsi_lun);

			rc = sas_abort_task_set(device, lun.scsi_lun);

			if (rc == TMF_RESP_FUNC_COMPLETE) {

				hisi_sas_release_task(hisi_hba, device);

				break;
@@ -1316,7 +1316,7 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba) 
				device->linkrate = phy->sas_phy.linkrate;



			hisi_hba->hw->setup_itct(hisi_hba, sas_dev);

		} else

		} else if (!port->port_attached)

			port->id = 0xff;

	}

}