ide-cd: use ide_cd_release() in ide_cd_probe() (05017db3) · Commits · 戴 / test

Use ide_cd_release() to do the cleanup if ide_cdrom_setup() fails. It fixes: - the default drive->dsc_overlap value not being restored - the default drive->queue's prep_rq_fn not being restored - struct gendisk 'g' not being freed - wrong function name being reported on unregister_cdrom() error Signed-off-by:

Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-cd.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -3507,15 +3507,8 @@ static int ide_cd_probe(ide_drive_t *drive)
		g->driverfs_dev = &drive->gendev;
		g->flags = GENHD_FL_CD \| GENHD_FL_REMOVABLE;
		if (ide_cdrom_setup(drive)) {
		struct cdrom_device_info *devinfo = &info->devinfo;
		ide_proc_unregister_driver(drive, &ide_cdrom_driver);
		kfree(info->buffer);
		kfree(info->toc);
		kfree(info->changer_info);
		if (devinfo->handle == drive && unregister_cdrom(devinfo))
		printk (KERN_ERR "%s: ide_cdrom_cleanup failed to unregister device from the cdrom driver.\n", drive->name);
		kfree(info);
		drive->driver_data = NULL;
		ide_cd_release(&info->kref);
		goto failed;
		}

Admin message