diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-07 20:26:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-07 20:26:21 +0300 |
| commit | 6bbf59145c4b29a384b0a66d63ddfbf55eeb91c4 (patch) | |
| tree | 69dc4ba6510e66bb7e4bc476ec6b5d1bfdc5ae35 /drivers/block | |
| parent | 0b6684ba5f5abf0dbbda35af570443181910a780 (diff) | |
| parent | fb7b9b0231ba8f77587c23f5257a4fdb6df1219e (diff) | |
| download | linux-6bbf59145c4b29a384b0a66d63ddfbf55eeb91c4.tar.xz | |
Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A few minor fixes:
- Fix ldm kernel-doc warning (Bart)
- Fix adding offset twice for DMA address in n64cart (Christoph)
- Fix use-after-free in dasd path handling (Stefan)
- Order kyber insert trace correctly (Vincent)
- raid1 errored write handling fix (Wei)
- Fix blk-iolatency queue get failure handling (Yu)"
* tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block:
kyber: make trace_block_rq call consistent with documentation
block/partitions/ldm.c: Fix a kernel-doc warning
blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit()
n64cart: fix the dma address in n64cart_do_bvec
s390/dasd: fix use after free in dasd path handling
md/raid10: properly indicate failure when ending a failed write request
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/n64cart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/n64cart.c b/drivers/block/n64cart.c index 7b4dd10af9ec..c84be0028f63 100644 --- a/drivers/block/n64cart.c +++ b/drivers/block/n64cart.c @@ -74,7 +74,7 @@ static bool n64cart_do_bvec(struct device *dev, struct bio_vec *bv, u32 pos) n64cart_wait_dma(); - n64cart_write_reg(PI_DRAM_REG, dma_addr + bv->bv_offset); + n64cart_write_reg(PI_DRAM_REG, dma_addr); n64cart_write_reg(PI_CART_REG, (bstart | CART_DOMAIN) & CART_MAX); n64cart_write_reg(PI_WRITE_REG, bv->bv_len - 1); |