From a6b3ae861cc8bdc9b30f56a4d2a53710877c9235 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Mon, 29 Oct 2012 22:00:16 +0200 Subject: [PATCH] uterm: input: don't test device capability in wakeup_dev The current code ignores non-keyboard devices, and various places implicitly assume that it does. If we ever need finer granularity, we should review (and probably restructure) the code for that; but for now this test seems out of place. Signed-off-by: Ran Benita Signed-off-by: David Herrmann --- src/uterm_input.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/uterm_input.c b/src/uterm_input.c index 47841ef..49719ad 100644 --- a/src/uterm_input.c +++ b/src/uterm_input.c @@ -110,18 +110,15 @@ static int input_wake_up_dev(struct uterm_input_dev *dev) return -EFAULT; } - if (dev->capabilities & UTERM_DEVICE_HAS_KEYS) { - /* rediscover the keyboard state if sth changed during sleep */ - uxkb_dev_reset(dev); + /* rediscover the keyboard state if sth changed during sleep */ + uxkb_dev_reset(dev); - ret = ev_eloop_new_fd(dev->input->eloop, &dev->fd, - dev->rfd, EV_READABLE, - input_data_dev, dev); - if (ret) { - close(dev->rfd); - dev->rfd = -1; - return ret; - } + ret = ev_eloop_new_fd(dev->input->eloop, &dev->fd, dev->rfd, + EV_READABLE, input_data_dev, dev); + if (ret) { + close(dev->rfd); + dev->rfd = -1; + return ret; } return 0;