Commit 64677779 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:
 "One minor fix and two patches reworking the ata dma drain for the
  !CONFIG_LIBATA case. The latter is a 5.7 regression fix"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers
  scsi: libata: Provide an ata_scsi_dma_need_drain stub for !CONFIG_ATA
  scsi: ufs-bsg: Fix runtime PM imbalance on error
parents a5c6a1f0 b8f1d1e0

drivers/scsi/aic94xx/aic94xx_init.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static struct scsi_host_template aic94xx_sht = { 
	/* .name is initialized */

	.name			= "aic94xx",

	.queuecommand		= sas_queuecommand,

	.dma_need_drain		= ata_scsi_dma_need_drain,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= sas_slave_configure,

	.scan_finished		= asd_scan_finished,

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,7 @@ static struct scsi_host_template sht_v1_hw = { 
	.proc_name		= DRV_NAME,

	.module			= THIS_MODULE,

	.queuecommand		= sas_queuecommand,

	.dma_need_drain		= ata_scsi_dma_need_drain,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= hisi_sas_slave_configure,

	.scan_finished		= hisi_sas_scan_finished,

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -3532,6 +3532,7 @@ static struct scsi_host_template sht_v2_hw = { 
	.proc_name		= DRV_NAME,

	.module			= THIS_MODULE,

	.queuecommand		= sas_queuecommand,

	.dma_need_drain		= ata_scsi_dma_need_drain,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= hisi_sas_slave_configure,

	.scan_finished		= hisi_sas_scan_finished,

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -3075,6 +3075,7 @@ static struct scsi_host_template sht_v3_hw = { 
	.proc_name		= DRV_NAME,

	.module			= THIS_MODULE,

	.queuecommand		= sas_queuecommand,

	.dma_need_drain		= ata_scsi_dma_need_drain,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= hisi_sas_slave_configure,

	.scan_finished		= hisi_sas_scan_finished,

drivers/scsi/ipr.c

+1 −0
Original line number Diff line number Diff line
@@ -6731,6 +6731,7 @@ static struct scsi_host_template driver_template = { 
	.compat_ioctl = ipr_ioctl,

#endif

	.queuecommand = ipr_queuecommand,

	.dma_need_drain = ata_scsi_dma_need_drain,

	.eh_abort_handler = ipr_eh_abort,

	.eh_device_reset_handler = ipr_eh_dev_reset,

	.eh_host_reset_handler = ipr_eh_host_reset,