summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-core.c
diff options
context:
space:
mode:
authorJiri Kosina2009-03-30 15:14:53 +0200
committerJiri Kosina2009-03-30 15:14:53 +0200
commit621de593081524da2f0f7b060f5951b4155eb4a2 (patch)
treedcb1777094498496a3036b0e49546887e72d6a06 /drivers/hid/hid-core.c
parentHID: remove compat stuff (diff)
parentHID: autosuspend -- fix lockup of hid on reset (diff)
downloadkernel-qcow2-linux-621de593081524da2f0f7b060f5951b4155eb4a2.tar.gz
kernel-qcow2-linux-621de593081524da2f0f7b060f5951b4155eb4a2.tar.xz
kernel-qcow2-linux-621de593081524da2f0f7b060f5951b4155eb4a2.zip
Merge branch 'autosuspend' into for-next
Conflicts: drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/hid-core.c')
-rw-r--r--drivers/hid/hid-core.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e56f8d5d3a50..5746a5903bce 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1819,6 +1819,22 @@ void hid_unregister_driver(struct hid_driver *hdrv)
}
EXPORT_SYMBOL_GPL(hid_unregister_driver);
+int hid_check_keys_pressed(struct hid_device *hid)
+{
+ struct hid_input *hidinput;
+ int i;
+
+ list_for_each_entry(hidinput, &hid->inputs, list) {
+ for (i = 0; i < BITS_TO_LONGS(KEY_MAX); i++)
+ if (hidinput->input->key[i])
+ return 1;
+ }
+
+ return 0;
+}
+
+EXPORT_SYMBOL_GPL(hid_check_keys_pressed);
+
static int __init hid_init(void)
{
int ret;