summaryrefslogtreecommitdiffstats
path: root/drivers/input/input.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-10-09 12:01:14 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-10-19 16:54:49 -0700
commit8724ecb072293f109a6f5dc93be8a98bf61fe14f (patch)
treef63e205ecb0af4420d175b29832992db8fcfc1d3 /drivers/input/input.c
parent55dfce873dca46df00304c44a568d7933bffff89 (diff)
downloadlinux-8724ecb072293f109a6f5dc93be8a98bf61fe14f.tar.gz
linux-8724ecb072293f109a6f5dc93be8a98bf61fe14f.tar.bz2
linux-8724ecb072293f109a6f5dc93be8a98bf61fe14f.zip
Input: allow matching device IDs on property bits
Let's allow matching input devices on their property bits, both in-kernel and when generating module aliases. Tested-by: Roderick Colenbrander <roderick.colenbrander@sony.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r--drivers/input/input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 02e6ea7955fe..762bfb9487dc 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -960,7 +960,8 @@ bool input_match_device_id(const struct input_dev *dev,
!bitmap_subset(id->ledbit, dev->ledbit, LED_MAX) ||
!bitmap_subset(id->sndbit, dev->sndbit, SND_MAX) ||
!bitmap_subset(id->ffbit, dev->ffbit, FF_MAX) ||
- !bitmap_subset(id->swbit, dev->swbit, SW_MAX)) {
+ !bitmap_subset(id->swbit, dev->swbit, SW_MAX) ||
+ !bitmap_subset(id->propbit, dev->propbit, INPUT_PROP_MAX)) {
return false;
}