aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorVipul Kumar Samar <vipulkumar.samar@st.com>2012-07-07 18:00:10 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-07-07 18:01:43 -0700
commit5bdea83565e8b290410521d0dd64b7d3cc41603b (patch)
tree07d716ebea3aacd83d911c7fc7da0d900324bc6b /drivers/input/keyboard
parentInput: wacom_i2c - fix compiler warning (diff)
downloadlinux-dev-5bdea83565e8b290410521d0dd64b7d3cc41603b.tar.xz
linux-dev-5bdea83565e8b290410521d0dd64b7d3cc41603b.zip
Input: spear-keyboard - fix disable device_init_wakeup in remove
This patch is to disable device wakeup while removing keyboard. Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/spear-keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index 6f287f7e1538..45dd02cbcaa0 100644
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -302,7 +302,7 @@ static int __devexit spear_kbd_remove(struct platform_device *pdev)
release_mem_region(kbd->res->start, resource_size(kbd->res));
kfree(kbd);
- device_init_wakeup(&pdev->dev, 1);
+ device_init_wakeup(&pdev->dev, 0);
platform_set_drvdata(pdev, NULL);
return 0;