diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-13 14:21:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-13 14:21:01 +0100 |
| commit | c938bb0cf644a61cc6222cc6d0f106bb5c4b4ff5 (patch) | |
| tree | 22e62a91a4674df9043d298994a27acc11830044 /drivers/mtd | |
| parent | Add support for stacked/parallel memories (diff) | |
| parent | Linux 6.3-rc2 (diff) | |
| download | linux-c938bb0cf644a61cc6222cc6d0f106bb5c4b4ff5.tar.xz linux-c938bb0cf644a61cc6222cc6d0f106bb5c4b4ff5.zip | |
Merge tag 'v6.3-rc2' into spi-6.4 to fix clock related boot issues
Linux 6.3-rc2
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/pismo.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/ubi/block.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index 5fcefcd0baca..3e0fff3f129e 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c @@ -206,8 +206,7 @@ static void pismo_remove(struct i2c_client *client) kfree(pismo); } -static int pismo_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pismo_probe(struct i2c_client *client) { struct pismo_pdata *pdata = client->dev.platform_data; struct pismo_eeprom eeprom; @@ -260,7 +259,7 @@ static struct i2c_driver pismo_driver = { .driver = { .name = "pismo", }, - .probe = pismo_probe, + .probe_new = pismo_probe, .remove = pismo_remove, .id_table = pismo_id, }; diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index 1de87062c67b..3711d7f74600 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -221,7 +221,10 @@ static blk_status_t ubiblock_read(struct request *req) rq_for_each_segment(bvec, req, iter) flush_dcache_page(bvec.bv_page); - return errno_to_blk_status(ret); + + blk_mq_end_request(req, errno_to_blk_status(ret)); + + return BLK_STS_OK; } static int ubiblock_open(struct block_device *bdev, fmode_t mode) |