Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/

[firefly-linux-kernel-4.4.55.git] / drivers / char / pc8736x_gpio.c

diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index 72dcf222f1410ef7d36619e5359ef45a1b417879..c860de6a6fdedb1821da602ae38207740fd4a384 100644 (file)
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -15,12 +15,12 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/mutex.h>
 #include <linux/nsc_gpio.h>
 #include <linux/platform_device.h>
 #include <asm/uaccess.h>
-#include <asm/io.h>
 
 #define DEVNAME "pc8736x_gpio"
 
@@ -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;
 }