diff options
| author |   Samu Onkalo <samu.p.onkalo@nokia.com> | 2009-10-18 00:38:57 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-10-18 00:46:49 -0700 |
| commit | b0aba1e66c38d64be2c7dbf4b08c71857031ab67 (patch) | |
| tree | 1691861b033ef42331b30711a466025719f357c8 /drivers | |
| parent | Input: add DaVinci Keypad Driver (diff) | |
| download | linux-dev-b0aba1e66c38d64be2c7dbf4b08c71857031ab67.tar.xz linux-dev-b0aba1e66c38d64be2c7dbf4b08c71857031ab67.zip | |
Input: add open and close methods for polled devices
Optional open and close methods for preparing and closing
the device.
Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/input-polldev.c | 7 | ||||
| -rw-r--r-- | drivers/input/misc/wistron_btns.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c index 0d3ce7a50fb1..910220c127cb 100644 --- a/drivers/input/input-polldev.c +++ b/drivers/input/input-polldev.c @@ -80,8 +80,8 @@ static int input_open_polled_device(struct input_dev *input) if (error) return error; - if (dev->flush) - dev->flush(dev); + if (dev->open) + dev->open(dev); queue_delayed_work(polldev_wq, &dev->work, msecs_to_jiffies(dev->poll_interval)); @@ -95,6 +95,9 @@ static void input_close_polled_device(struct input_dev *input) cancel_delayed_work_sync(&dev->work); input_polldev_stop_workqueue(); + + if (dev->close) + dev->close(dev); } /** diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index a932179c4c9e..00eb9d651d97 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c @@ -1263,7 +1263,7 @@ static int __devinit setup_input_dev(void) if (!wistron_idev) return -ENOMEM; - wistron_idev->flush = wistron_flush; + wistron_idev->open = wistron_flush; wistron_idev->poll = wistron_poll; wistron_idev->poll_interval = POLL_INTERVAL_DEFAULT; |