From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 23 Apr 2026 11:06:43 +0000 (-0600)
Subject: Revert "floppy: fix reference leak on platform_device_register() failure"
X-Git-Tag: v7.1-rc1~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=895a9b37917d2718ef2240a7ead7458c22f1f011;p=thirdparty%2Fkernel%2Flinux.git

Revert "floppy: fix reference leak on platform_device_register() failure"

This reverts commit e784f2ea0b4fd0e7b70028ff8218f22456c5dcf8.

Jiri says the patch is buggy, and it looks like he is right revert it
for now.

Link: https://lore.kernel.org/linux-block/897f442d-4e04-4b70-b716-38fd10b8af36@kernel.org/
Reported-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index a028bf6b8ae2..0509746f8aed 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4722,19 +4722,15 @@ static int __init do_floppy_init(void)
 		floppy_device[drive].dev.groups = floppy_dev_groups;
 
 		err = platform_device_register(&floppy_device[drive]);
-		if (err) {
-			platform_device_put(&floppy_device[drive]);
+		if (err)
 			goto out_remove_drives;
-		}
+
 		registered[drive] = true;
 
 		err = device_add_disk(&floppy_device[drive].dev,
 				      disks[drive][0], NULL);
-		if (err) {
-			platform_device_unregister(&floppy_device[drive]);
-			registered[drive] = false;
+		if (err)
 			goto out_remove_drives;
-		}
 	}
 
 	return 0;