aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2014-04-03 19:32:26 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-25 18:10:43 -0400
commit9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 (patch)
tree7219355d62954d139ae84d5b781be3e51287dd37 /drivers/media/rc
parentc5540fbb9de39ceec108a889133664a887c2f55a (diff)
[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')
-rw-r--r--drivers/media/rc/rc-main.c4
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,
285 * IR tables from other remotes. So, we support specifying a mask to 285 * IR tables from other remotes. So, we support specifying a mask to
286 * indicate the valid bits of the scancodes. 286 * indicate the valid bits of the scancodes.
287 */ 287 */
288 if (dev->scanmask) 288 if (dev->scancode_mask)
289 scancode &= dev->scanmask; 289 scancode &= dev->scancode_mask;
290 290
291 /* First check if we already have a mapping for this ir command */ 291 /* First check if we already have a mapping for this ir command */
292 for (i = 0; i < rc_map->len; i++) { 292 for (i = 0; i < rc_map->len; i++) {