[PATCH 6/9] m68k/emu/nfblock: add error handling support for add_disk()

[Luis Chamberlain <mcgrof@xxxxxxxxxx>]

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@xxxxxxxxxxxxxx>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
---
 arch/m68k/emu/nfblock.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index 9a8394e96388..4de5a6087034 100644
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -100,6 +100,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 
bsize)
 {
        struct nfhd_device *dev;
        int dev_id = id - NFHD_DEV_OFFSET;
+       int err = -ENOMEM;
 
        pr_info("nfhd%u: found device with %u blocks (%u bytes)\n", dev_id,
                blocks, bsize);
@@ -130,16 +131,20 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 
bsize)
        sprintf(dev->disk->disk_name, "nfhd%u", dev_id);
        set_capacity(dev->disk, (sector_t)blocks * (bsize / 512));
        blk_queue_logical_block_size(dev->disk->queue, bsize);
-       add_disk(dev->disk);
+       err = add_disk(dev->disk);
+       if (err)
+               goto out_cleanup_disk;
 
        list_add_tail(&dev->list, &nfhd_list);
 
        return 0;
 
+out_cleanup_disk:
+       blk_cleanup_disk(dev->disk);
 free_dev:
        kfree(dev);
 out:
-       return -ENOMEM;
+       return err;
 }
 
 static int __init nfhd_init(void)
-- 
2.30.2