summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-25 10:39:50 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-25 10:39:50 -0200
commit648862d26603ff7d30334417fda9c5d8bfa0871a (patch)
treec1ee210105cadd3188b33ddbbd4c4fc433b2a870 /linux/drivers/media/video/em28xx/em28xx-input.c
parent7a8e65e6272706e69c47c96e865ec1170c1e1564 (diff)
downloadmediapointer-dvb-s2-648862d26603ff7d30334417fda9c5d8bfa0871a.tar.gz
mediapointer-dvb-s2-648862d26603ff7d30334417fda9c5d8bfa0871a.tar.bz2
Remove duplicated fields on em28xx_board and em28xx structs
From: Mauro Carvalho Chehab <mchehab@redhat.com> 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. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-input.c')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c
index 29900920d..d6ef5c461 100644
--- a/linux/drivers/media/video/em28xx/em28xx-input.c
+++ b/linux/drivers/media/video/em28xx/em28xx-input.c
@@ -345,7 +345,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;
}
@@ -384,7 +384,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;