diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2021-07-15 01:48:20 +0000 |
|---|---|---|
| committer | Luis Chamberlain <mcgrof@kernel.org> | 2021-07-14 20:57:38 -0700 |
| commit | 521765ac9bd8d3911b79b1c7a232d35391cc64af (patch) | |
| tree | d06ba4f00f8a50b57622c7e5b669a4c7be202ce7 | |
| parent | d9d711bd9c7bbdc456eb26a90cf7600421f74ed7 (diff) | |
| download | linux-next-521765ac9bd8d3911b79b1c7a232d35391cc64af.tar.gz | |
ms_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>
| -rw-r--r-- | drivers/memstick/core/ms_block.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 4a4573fa7b0fa..96c95f5e12218 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -2156,10 +2156,14 @@ static int msb_init_disk(struct memstick_dev *card) set_disk_ro(msb->disk, 1); msb_start(card); - device_add_disk(&card->dev, msb->disk, NULL); + rc = device_add_disk(&card->dev, msb->disk, NULL); + if (rc) + goto out_cleanup_disk; dbg("Disk added"); return 0; +out_cleanup_disk: + blk_cleanup_disk(msb->queue); out_free_tag_set: blk_mq_free_tag_set(&msb->tag_set); out_release_id: |