Commit 1017f6af authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds

[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: default avatarIngo Molnar <mingo@elte.hu>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 491d525f
...@@ -319,9 +319,10 @@ static int __init pc8736x_gpio_init(void) ...@@ -319,9 +319,10 @@ static int __init pc8736x_gpio_init(void)
return 0; return 0;
undo_platform_dev_add: undo_platform_dev_add:
platform_device_put(pdev); platform_device_del(pdev);
undo_platform_dev_alloc: undo_platform_dev_alloc:
kfree(pdev); platform_device_put(pdev);
return rc; return rc;
} }
......
...@@ -126,9 +126,10 @@ static int __init scx200_gpio_init(void) ...@@ -126,9 +126,10 @@ static int __init scx200_gpio_init(void)
undo_chrdev_region: undo_chrdev_region:
unregister_chrdev_region(dev, num_pins); unregister_chrdev_region(dev, num_pins);
undo_platform_device_add: undo_platform_device_add:
platform_device_put(pdev); platform_device_del(pdev);
undo_malloc: undo_malloc:
kfree(pdev); platform_device_put(pdev);
return rc; return rc;
} }
...@@ -136,7 +137,6 @@ static void __exit scx200_gpio_cleanup(void) ...@@ -136,7 +137,6 @@ static void __exit scx200_gpio_cleanup(void)
{ {
kfree(scx200_devices); kfree(scx200_devices);
unregister_chrdev_region(MKDEV(major, 0), num_pins); unregister_chrdev_region(MKDEV(major, 0), num_pins);
platform_device_put(pdev);
platform_device_unregister(pdev); platform_device_unregister(pdev);
/* kfree(pdev); */ /* kfree(pdev); */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment