mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 09:31:50 +00:00
[PATCH] fix platform_device_put/del mishaps
This fixes drivers/char/pc8736x_gpio.c and drivers/char/scx200_gpio.c to use the platform_device_del/put ops correctly. Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Jim Cromie <jim.cromie@gmail.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
491d525ff1
commit
1017f6afd5
@ -319,9 +319,10 @@ static int __init pc8736x_gpio_init(void)
|
||||
return 0;
|
||||
|
||||
undo_platform_dev_add:
|
||||
platform_device_put(pdev);
|
||||
platform_device_del(pdev);
|
||||
undo_platform_dev_alloc:
|
||||
kfree(pdev);
|
||||
platform_device_put(pdev);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -126,9 +126,10 @@ static int __init scx200_gpio_init(void)
|
||||
undo_chrdev_region:
|
||||
unregister_chrdev_region(dev, num_pins);
|
||||
undo_platform_device_add:
|
||||
platform_device_put(pdev);
|
||||
platform_device_del(pdev);
|
||||
undo_malloc:
|
||||
kfree(pdev);
|
||||
platform_device_put(pdev);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
@ -136,7 +137,6 @@ static void __exit scx200_gpio_cleanup(void)
|
||||
{
|
||||
kfree(scx200_devices);
|
||||
unregister_chrdev_region(MKDEV(major, 0), num_pins);
|
||||
platform_device_put(pdev);
|
||||
platform_device_unregister(pdev);
|
||||
/* kfree(pdev); */
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user