[PATCH] kfree cleanup: misc remaining drivers
This is the remaining misc drivers/ part of the big kfree cleanup patch. Remove pointless checks for NULL prior to calling kfree() in misc files in drivers/. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Acked-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org> Acked-by: Roland Dreier <rolandd@cisco.com> Acked-by: Pierre Ossman <drzeus@drzeus.cx> Acked-by: Jean Delvare <khali@linux-fr.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Len Brown <len.brown@intel.com> Acked-by: "Antonino A. Daplas" <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
このコミットが含まれているのは:
@@ -3292,12 +3292,9 @@ static void ide_cd_release(struct kref *kref)
|
||||
ide_drive_t *drive = info->drive;
|
||||
struct gendisk *g = info->disk;
|
||||
|
||||
if (info->buffer != NULL)
|
||||
kfree(info->buffer);
|
||||
if (info->toc != NULL)
|
||||
kfree(info->toc);
|
||||
if (info->changer_info != NULL)
|
||||
kfree(info->changer_info);
|
||||
kfree(info->buffer);
|
||||
kfree(info->toc);
|
||||
kfree(info->changer_info);
|
||||
if (devinfo->handle == drive && unregister_cdrom(devinfo))
|
||||
printk(KERN_ERR "%s: %s failed to unregister device from the cdrom "
|
||||
"driver.\n", __FUNCTION__, drive->name);
|
||||
@@ -3487,12 +3484,9 @@ static int ide_cd_probe(struct device *dev)
|
||||
if (ide_cdrom_setup(drive)) {
|
||||
struct cdrom_device_info *devinfo = &info->devinfo;
|
||||
ide_unregister_subdriver(drive, &ide_cdrom_driver);
|
||||
if (info->buffer != NULL)
|
||||
kfree(info->buffer);
|
||||
if (info->toc != NULL)
|
||||
kfree(info->toc);
|
||||
if (info->changer_info != NULL)
|
||||
kfree(info->changer_info);
|
||||
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);
|
||||
|
新しいイシューから参照
ユーザーをブロックする