Commit 8f9a2a19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libata-5.10-2020-10-30' of git://git.kernel.dk/linux-block 

Pull libata fix from Jens Axboe:
 "Single fix for an old regression with sata_nv"

* tag 'libata-5.10-2020-10-30' of git://git.kernel.dk/linux-block:
  ata: sata_nv: Fix retrieving of active qcs
parents f5d80856 8e4c309f

drivers/ata/sata_nv.c

+1 −1
Original line number Diff line number Diff line
@@ -2100,7 +2100,7 @@ static int nv_swncq_sdbfis(struct ata_port *ap) 
	pp->dhfis_bits &= ~done_mask;

	pp->dmafis_bits &= ~done_mask;

	pp->sdbfis_bits |= done_mask;

	ata_qc_complete_multiple(ap, ap->qc_active ^ done_mask);

	ata_qc_complete_multiple(ap, ata_qc_get_active(ap) ^ done_mask);



	if (!ap->qc_active) {

		DPRINTK("over\n");