aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/ams_delta_serio.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-06 22:34:59 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-06 22:34:59 -0800
commit554738da71004d96e06fb75f4772dfc3b0f47810 (patch)
tree149a96ce3727025d3b9260961ec94ba8306db278 /drivers/input/serio/ams_delta_serio.c
parent7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 (diff)
parenta6d38f889750ed6290728a19d9dad577b147c6d0 (diff)
downloadkernel_samsung_smdk4412-554738da71004d96e06fb75f4772dfc3b0f47810.zip
kernel_samsung_smdk4412-554738da71004d96e06fb75f4772dfc3b0f47810.tar.gz
kernel_samsung_smdk4412-554738da71004d96e06fb75f4772dfc3b0f47810.tar.bz2
Merge branch 'next' into for-linus
Conflicts: include/linux/input.h
Diffstat (limited to 'drivers/input/serio/ams_delta_serio.c')
-rw-r--r--drivers/input/serio/ams_delta_serio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
index 8f1770e..ebe9553 100644
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -172,6 +172,5 @@ static void __exit ams_delta_serio_exit(void)
free_irq(OMAP_GPIO_IRQ(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0);
gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
- kfree(ams_delta_serio);
}
module_exit(ams_delta_serio_exit);