Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemo...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jan 2022 08:22:11 +0000 (10:22 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jan 2022 08:22:11 +0000 (10:22 +0200)
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()

drivers/ata/pata_octeon_cf.c

index 0912846bc1b0a281165345c3eaf9b46b7211c6a0..05c2ab3757568c62a93377fe9a5ceed19f49e3f1 100644 (file)
@@ -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;