diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-20 19:23:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-20 19:23:13 -0700 |
| commit | 64677779e8962c20b580b471790fe42367750599 (patch) | |
| tree | 860090fc885daab7a42da134dc0e29155f00e7cd /drivers/scsi/aic94xx/aic94xx_init.c | |
| parent | a5c6a1f0fe1d182489864b708fa472d0333b39d4 (diff) | |
| parent | b8f1d1e05817f5e5f7517911b55ea13d2c0438a0 (diff) | |
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
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_init.c')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index d022407e5645..bef47f38dd0d 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -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, |