diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2021-10-12 08:27:45 +0200 |
|---|---|---|
| committer | Damien Le Moal <damien.lemoal@wdc.com> | 2021-10-12 17:46:48 +0900 |
| commit | 6ac586f2e71692b46affc064cc69b8df416fe95c (patch) | |
| tree | 00d1db5bdef999050b6ccb68974fd41323124267 /drivers/ata/libata-scsi.c | |
| parent | f971a85439bd25dc7b4d597cf5e4e8dc7ffc884b (diff) | |
| download | linux-6ac586f2e71692b46affc064cc69b8df416fe95c.tar.gz | |
libata-scsi: fix checking of DMA state
Checking if DMA is enabled should be done via the ata_dma_enabled helper function, since the init state 0xff indicates disabled. Change based on code review, not tested due to lack of hardware. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 1fb4611f7eeb..0adea33f2137 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -2981,7 +2981,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc) ata_qc_set_pc_nbytes(qc); /* We may not issue DMA commands if no DMA mode is set */ - if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0) { + if (tf->protocol == ATA_PROT_DMA && !ata_dma_enabled(dev)) { fp = 1; goto invalid_fld; } @@ -3131,7 +3131,7 @@ static unsigned int ata_scsi_write_same_xlat(struct ata_queued_cmd *qc) u8 unmap = cdb[1] & 0x8; /* we may not issue DMA commands if no DMA mode is set */ - if (unlikely(!dev->dma_mode)) + if (unlikely(!ata_dma_enabled(dev))) goto invalid_opcode; /* |