cdrom/gdrom: add error handling support for add_disk()
authorLuis Chamberlain <mcgrof@kernel.org>
Mon, 27 Sep 2021 22:02:27 +0000 (15:02 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 18 Oct 2021 20:41:37 +0000 (14:41 -0600)
We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/cdrom/gdrom.c

index 8e1fe75af93f850277efb298982ba6146a20becb..d50cc1fd34d5ffd650d2bddc50cd35fa764aaf2d 100644 (file)
@@ -805,9 +805,14 @@ static int probe_gdrom(struct platform_device *devptr)
                err = -ENOMEM;
                goto probe_fail_free_irqs;
        }
-       add_disk(gd.disk);
+       err = add_disk(gd.disk);
+       if (err)
+               goto probe_fail_add_disk;
+
        return 0;
 
+probe_fail_add_disk:
+       kfree(gd.toc);
 probe_fail_free_irqs:
        free_irq(HW_EVENT_GDROM_DMA, &gd);
        free_irq(HW_EVENT_GDROM_CMD, &gd);