summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-17 18:12:46 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 11:16:50 +0100
commit29e3ec19d5c88d534ced219d3962d67243e4d310 (patch)
treee0812ae052cad72c48158ac9faf587a1576f22ee /drivers/media/video/cx231xx/cx231xx-input.c
parent[media] Rename all public generic RC functions from ir_ to rc_ (diff)
downloadlinux-29e3ec19d5c88d534ced219d3962d67243e4d310.tar.xz
linux-29e3ec19d5c88d534ced219d3962d67243e4d310.zip
[media] cx231xx: Properly name rc_map name
rc_map is confusing, as it may be understood as another thing. Properly rename the field to indicate its usage. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-input.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c
index 65d951e03c17..1d043ed1bc32 100644
--- a/drivers/media/video/cx231xx/cx231xx-input.c
+++ b/drivers/media/video/cx231xx/cx231xx-input.c
@@ -57,7 +57,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
dev_dbg(&dev->udev->dev, "%s\n", __func__);
/* Only initialize if a rc keycode map is defined */
- if (!cx231xx_boards[dev->model].rc_map)
+ if (!cx231xx_boards[dev->model].rc_map_name)
return -ENODEV;
request_module("ir-kbd-i2c");
@@ -80,7 +80,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
* an i2c device.
*/
dev->init_data.get_key = get_key_isdbt;
- dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map;
+ dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map_name;
/* The i2c micro-controller only outputs the cmd part of NEC protocol */
dev->init_data.rc_dev->scanmask = 0xff;
dev->init_data.rc_dev->driver_name = "cx231xx";