summaryrefslogtreecommitdiff
path: root/drivers/input/input.c
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2002-08-25 19:21:22 +0200
committerVojtech Pavlik <vojtech@suse.cz>2002-08-25 19:21:22 +0200
commit532c236e53d6e76b73dbb0b70b401a655e1daf07 (patch)
tree35dc51f77e63961047eab014f9f88394657a3b16 /drivers/input/input.c
parent46a704f660f681ba09847c1d2677c63f593ae21f (diff)
This (re)implements getkeycode/setkeycode, kbd_rate and kd_mksound
as functions interfacing to the input core. PC-Speaker handling is moved to a separate file. Uinput is moved to a input/misc directory.
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r--drivers/input/input.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 0bd17fbd49fd..da4ed6e6dcf5 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -105,7 +105,7 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
change_bit(code, dev->key);
- if (test_bit(EV_REP, dev->evbit) && value) {
+ if (test_bit(EV_REP, dev->evbit) && dev->rep[REP_PERIOD] && value) {
dev->repeat_key = code;
mod_timer(&dev->timer, jiffies + dev->rep[REP_DELAY]);
}
@@ -165,10 +165,9 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
case EV_SND:
- if (code > SND_MAX || !test_bit(code, dev->sndbit) || !!test_bit(code, dev->snd) == value)
+ if (code > SND_MAX || !test_bit(code, dev->sndbit))
return;
- change_bit(code, dev->snd);
if (dev->event) dev->event(dev, type, code, value);
break;