From bec38bfb66aff08704f1ba4b62544cdeaea294f9 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 30 Jun 2006 01:55:29 -0700
Subject: [PATCH] --- yaml --- r: 31367 b: refs/heads/master c:
 1017f6afd578fe519d316d7148356703c04e8f03 h: refs/heads/master i:   31365:
 39e24351eb43f7f70dc9af3df0609af841548100   31363:
 1f09c17d3c5455fa1cf6c346d906eb96eef44256   31359:
 9c7820f33c2d4629aba9888dc84cc416cee15935 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/char/pc8736x_gpio.c | 5 +++--
 trunk/drivers/char/scx200_gpio.c  | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 237acf6b5d80..e9385a616873 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 491d525ff19ead83b5e27ae4096b5c3e27805601
+refs/heads/master: 1017f6afd578fe519d316d7148356703c04e8f03
diff --git a/trunk/drivers/char/pc8736x_gpio.c b/trunk/drivers/char/pc8736x_gpio.c
index 1c706ccfdbb3..c860de6a6fde 100644
--- a/trunk/drivers/char/pc8736x_gpio.c
+++ b/trunk/drivers/char/pc8736x_gpio.c
@@ -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;
 }
 
diff --git a/trunk/drivers/char/scx200_gpio.c b/trunk/drivers/char/scx200_gpio.c
index 5a280a330401..45083e5dd23b 100644
--- a/trunk/drivers/char/scx200_gpio.c
+++ b/trunk/drivers/char/scx200_gpio.c
@@ -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); */
 }