On Thu, Aug 09, 2012 at 04:59:49PM -0300, Herton Ronaldo Krzesinski wrote: > On do_floppy_init, 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.krzesin...@canonical.com> > Cc: sta...@vger.kernel.org > ---
Looks good to me. Acked-by: Vivek Goyal <vgo...@redhat.com> Vivek > drivers/block/floppy.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c > index 9272203..3eafe93 100644 > --- a/drivers/block/floppy.c > +++ b/drivers/block/floppy.c > @@ -4294,7 +4294,7 @@ static int __init do_floppy_init(void) > > err = platform_device_register(&floppy_device[drive]); > if (err) > - goto out_release_dma; > + goto out_remove_drives; > > err = device_create_file(&floppy_device[drive].dev, > &dev_attr_cmos); > @@ -4313,6 +4313,14 @@ static int __init do_floppy_init(void) > > out_unreg_platform_dev: > platform_device_unregister(&floppy_device[drive]); > +out_remove_drives: > + while (drive--) { > + if (disk_registered[drive]) { > + del_gendisk(disks[drive]); > + device_remove_file(&floppy_device[drive].dev, > &dev_attr_cmos); > + platform_device_unregister(&floppy_device[drive]); > + } > + } > out_release_dma: > if (atomic_read(&usage_count)) > floppy_release_irq_and_dma(); > -- > 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/