Commit ec28fcc6 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Jens Axboe
Browse files

floppy: address add_disk() error handling on probe 



We need to cleanup resources on the probe() callback registered
with __register_blkdev(), now that add_disk() error handling is
supported. Address this.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211103230437.1639990-14-mcgrof@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 46a7db49

drivers/block/floppy.c

+13 −4
Original line number Diff line number Diff line
@@ -4528,10 +4528,19 @@ static void floppy_probe(dev_t dev) 
		return;



	mutex_lock(&floppy_probe_lock);

	if (!disks[drive][type]) {

		if (floppy_alloc_disk(drive, type) == 0)

			add_disk(disks[drive][type]);

	}

	if (disks[drive][type])

		goto out;

	if (floppy_alloc_disk(drive, type))

		goto out;

	if (add_disk(disks[drive][type]))

		goto cleanup_disk;

out:

	mutex_unlock(&floppy_probe_lock);

	return;



cleanup_disk:

	blk_cleanup_disk(disks[drive][type]);

	disks[drive][type] = NULL;

	mutex_unlock(&floppy_probe_lock);

}