summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-30 14:51:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-30 14:51:01 -0700
commit8f9a2a196bc3f838996364f5b8f73b8a4ee5a552 (patch)
tree115d99540fe21994280366472e577dfa45cd199b
parentf5d808567a51d97e171e0a8111813f973bf4ac12 (diff)
parent8e4c309f9f33b76c09daa02b796ef87918eee494 (diff)
downloadlwn-8f9a2a196bc3f838996364f5b8f73b8a4ee5a552.tar.gz
lwn-8f9a2a196bc3f838996364f5b8f73b8a4ee5a552.zip
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
-rw-r--r--drivers/ata/sata_nv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index eb9dc14e5147..20190f66ced9 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -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");