tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

m68k/emu/nfblock: 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.

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211015233028.2167651-7-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Luis Chamberlain and committed by
Jens Axboe 21fd880d 293a7c52

+7 -2
+7 -2
arch/m68k/emu/nfblock.c
··· 99 99 { 100 100 struct nfhd_device *dev; 101 101 int dev_id = id - NFHD_DEV_OFFSET; 102 + int err = -ENOMEM; 102 103 103 104 pr_info("nfhd%u: found device with %u blocks (%u bytes)\n", dev_id, 104 105 blocks, bsize); ··· 130 129 sprintf(dev->disk->disk_name, "nfhd%u", dev_id); 131 130 set_capacity(dev->disk, (sector_t)blocks * (bsize / 512)); 132 131 blk_queue_logical_block_size(dev->disk->queue, bsize); 133 - add_disk(dev->disk); 132 + err = add_disk(dev->disk); 133 + if (err) 134 + goto out_cleanup_disk; 134 135 135 136 list_add_tail(&dev->list, &nfhd_list); 136 137 137 138 return 0; 138 139 140 + out_cleanup_disk: 141 + blk_cleanup_disk(dev->disk); 139 142 free_dev: 140 143 kfree(dev); 141 144 out: 142 - return -ENOMEM; 145 + return err; 143 146 } 144 147 145 148 static int __init nfhd_init(void)