aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-25 09:39:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 17:53:41 -0200
commit505b6d0b774fa4475fedbd3cebf95199c17a0086 (patch)
treeea8fe176eba79808734e5d23241f67d0dbd1cc91 /drivers/media/video/em28xx/em28xx-input.c
parentd4d889e329bd0837598b3ef611806421754e9b83 (diff)
downloadkernel_samsung_smdk4412-505b6d0b774fa4475fedbd3cebf95199c17a0086.zip
kernel_samsung_smdk4412-505b6d0b774fa4475fedbd3cebf95199c17a0086.tar.gz
kernel_samsung_smdk4412-505b6d0b774fa4475fedbd3cebf95199c17a0086.tar.bz2
V4L/DVB (9752): Remove duplicated fields on em28xx_board and em28xx structs
Several fields are duplicated on both structs. Let's just copy em28xx_board instead. A later cleanup could just copy the fields that are changed, in order to keep em28xx_board const. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-input.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 07edd40..42bbaf6 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -327,7 +327,7 @@ int em28xx_ir_init(struct em28xx *dev)
u8 ir_config;
int err = -ENOMEM;
- if (dev->ir_codes == NULL) {
+ if (dev->board.ir_codes == NULL) {
/* No remote control support */
return 0;
}
@@ -366,7 +366,7 @@ int em28xx_ir_init(struct em28xx *dev)
usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
strlcat(ir->phys, "/input0", sizeof(ir->phys));
- ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER, dev->ir_codes);
+ ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER, dev->board.ir_codes);
input_dev->name = ir->name;
input_dev->phys = ir->phys;
input_dev->id.bustype = BUS_USB;