UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ataflop: 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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211103230437.1639990-13-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Luis Chamberlain 2021-11-03 16:04:35 -07:00 committed by Jens Axboe
parent 26e06f5b13
commit 46a7db492e
1 changed files with 12 additions and 6 deletions
drivers/block
ataflop.c

18
drivers/block/ataflop.c
View File

@ -2018,12 +2018,18 @@ static void ataflop_probe(dev_t dev)
if (drive >= FD_MAX_UNITS || type >= NUM_DISK_MINORS) if (drive >= FD_MAX_UNITS || type >= NUM_DISK_MINORS)
return; return;
if (!unit[drive].disk[type]) { if (unit[drive].disk[type])
if (ataflop_alloc_disk(drive, type) == 0) { return
add_disk(unit[drive].disk[type]); if (ataflop_alloc_disk(drive, type))
unit[drive].registered[type] = true; return;
} if (add_disk(unit[drive].disk[type]))
} goto cleanup_disk;
unit[drive].registered[type] = true;
return;
cleanup_disk:
blk_cleanup_disk(unit[drive].disk[type]);
unit[drive].disk[type] = NULL;
} }
static void atari_floppy_cleanup(void) static void atari_floppy_cleanup(void)