diff options
| author | Linus Torvalds <[email protected]> | 2022-01-22 08:22:11 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-01-22 08:22:11 +0000 |
| commit | b087788c20aa959f83df989b31fdcc4182b2d067 (patch) | |
| tree | 34ceff45f55bf19ba84dcae5ff4a69239632857d | |
| parent | Merge tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ata: pata_octeon_cf: fix call to trace_ata_bmdma_stop() (diff) | |
| download | kernel-b087788c20aa959f83df989b31fdcc4182b2d067.tar.gz kernel-b087788c20aa959f83df989b31fdcc4182b2d067.zip | |
Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata
Pull ATA fix from Damien Le Moal:
"A single patch to fix a compilation error in the pata_octeon_cf driver
(mips architecture), from me"
* tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
ata: pata_octeon_cf: fix call to trace_ata_bmdma_stop()
| -rw-r--r-- | drivers/ata/pata_octeon_cf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index 0912846bc1b0..05c2ab375756 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c @@ -595,7 +595,7 @@ static unsigned int octeon_cf_dma_finished(struct ata_port *ap, union cvmx_mio_boot_dma_intx dma_int; u8 status; - trace_ata_bmdma_stop(qc, &qc->tf, qc->tag); + trace_ata_bmdma_stop(ap, &qc->tf, qc->tag); if (ap->hsm_task_state != HSM_ST_LAST) return 0; |