Skip to content

Commit

Permalink
Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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()
  • Loading branch information
Linus Torvalds committed Jan 22, 2022
2 parents 6bdfb25 + b875b39 commit b087788
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/ata/pata_octeon_cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b087788

Please sign in to comment.