From: Luis Chamberlain <mcgrof@kernel.org>
Date: Mon, 27 Sep 2021 22:02:27 +0000 (-0700)
Subject: cdrom/gdrom: add error handling support for add_disk()
X-Git-Tag: v5.16-rc1~215^2~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6ac27c60fec4dc59473e39abf924e430a9ea320;p=thirdparty%2Flinux.git

cdrom/gdrom: 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.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 8e1fe75af93f8..d50cc1fd34d5f 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -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);