diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2021-09-02 20:40:59 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2021-10-12 11:21:16 +0300 |
| commit | b3f8eb6eb213977cb4e84af4067b234356936f82 (patch) | |
| tree | 6e0f078c1e8246ff5e19d49f5818fada371e486d /drivers/memstick/core | |
| parent | 2304c55fd506fcd5e1a59ae21a306ee82507340b (diff) | |
| download | linux-b3f8eb6eb213977cb4e84af4067b234356936f82.tar.xz | |
memstick: mspro_block: Add error handling support for add_disk()
We never checked for errors on add_disk() as this function returned void.
Now that this is fixed, use the shiny new error handling.
Contrary to the typical removal which delays the put_disk() until later,
since we are failing on a probe we immediately put the disk on failure from
add_disk by using blk_cleanup_disk().
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20210902174105.2418771-4-mcgrof@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/memstick/core')
| -rw-r--r-- | drivers/memstick/core/mspro_block.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 22778d0e24f5..c0450397b673 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c @@ -1239,10 +1239,14 @@ static int mspro_block_init_disk(struct memstick_dev *card) set_capacity(msb->disk, capacity); dev_dbg(&card->dev, "capacity set %ld\n", capacity); - device_add_disk(&card->dev, msb->disk, NULL); + rc = device_add_disk(&card->dev, msb->disk, NULL); + if (rc) + goto out_cleanup_disk; msb->active = 1; return 0; +out_cleanup_disk: + blk_cleanup_disk(msb->disk); out_free_tag_set: blk_mq_free_tag_set(&msb->tag_set); out_release_id: |