| From 5b4478f5dabb7f764e2fce480b47204e06095a73 Mon Sep 17 00:00:00 2001 |
| From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> |
| Date: Mon, 27 Aug 2012 20:56:54 -0300 |
| Subject: floppy: properly handle failure on add_disk loop |
| |
| From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> |
| |
| commit d60e7ec18c3fb2cbf90969ccd42889eb2d03aef9 upstream. |
| |
| On floppy initialization, if something failed inside the loop we call |
| add_disk, there was no cleanup of previous iterations in the error |
| handling. |
| |
| Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| [bwh: Backported to 3.2: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| Cc: Qiang Huang <h.huangqiang@huawei.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/block/floppy.c | 11 ++++++++++- |
| 1 file changed, 10 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/block/floppy.c |
| +++ b/drivers/block/floppy.c |
| @@ -4306,7 +4306,7 @@ static int __init floppy_init(void) |
| |
| err = platform_device_register(&floppy_device[drive]); |
| if (err) |
| - goto out_flush_work; |
| + goto out_remove_drives; |
| |
| err = device_create_file(&floppy_device[drive].dev, |
| &dev_attr_cmos); |
| @@ -4324,6 +4324,15 @@ static int __init floppy_init(void) |
| |
| out_unreg_platform_dev: |
| platform_device_unregister(&floppy_device[drive]); |
| +out_remove_drives: |
| + while (drive--) { |
| + if ((allowed_drive_mask & (1 << drive)) && |
| + fdc_state[FDC(drive)].version != FDC_NONE) { |
| + del_gendisk(disks[drive]); |
| + device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos); |
| + platform_device_unregister(&floppy_device[drive]); |
| + } |
| + } |
| out_flush_work: |
| flush_work_sync(&floppy_work); |
| if (atomic_read(&usage_count)) |
