diff options
| author | David Härdeman | 2014-04-04 01:32:26 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-07-26 00:10:43 +0200 |
| commit | 9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 (patch) | |
| tree | 7219355d62954d139ae84d5b781be3e51287dd37 /drivers/media/rc/rc-main.c | |
| parent | [media] rc-core: remove protocol arrays (diff) | |
| download | kernel-qcow2-linux-9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36.tar.gz kernel-qcow2-linux-9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36.tar.xz kernel-qcow2-linux-9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36.zip | |
[media] rc-core: rename dev->scanmask to dev->scancode_mask
We already have dev->scancode_filter and dev->scancode_wakeup_filter
so rename dev->scanmask to dev->scancode_mask for consistency.
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/rc/rc-main.c')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index c3fb8f8f192b..39e4b5ffe141 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -285,8 +285,8 @@ static unsigned int ir_establish_scancode(struct rc_dev *dev, * IR tables from other remotes. So, we support specifying a mask to * indicate the valid bits of the scancodes. */ - if (dev->scanmask) - scancode &= dev->scanmask; + if (dev->scancode_mask) + scancode &= dev->scancode_mask; /* First check if we already have a mapping for this ir command */ for (i = 0; i < rc_map->len; i++) { |