Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / sunkbd.c

diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index 3826db9403e633950c941fda8517bfc6b4c009e9..cc02383664140e1a0ff5ce38d05045af388c1598 100644 (file)
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -225,7 +225,7 @@ static void sunkbd_reinit(struct work_struct *work)
 static void sunkbd_enable(struct sunkbd *sunkbd, int enable)
 {
        serio_pause_rx(sunkbd->serio);
-       sunkbd->enabled = 1;
+       sunkbd->enabled = enable;
        serio_continue_rx(sunkbd->serio);
 }