diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-25 07:39:50 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:41 -0500 |
commit | 505b6d0b774fa4475fedbd3cebf95199c17a0086 (patch) | |
tree | ea8fe176eba79808734e5d23241f67d0dbd1cc91 /drivers/media/video/em28xx/em28xx-input.c | |
parent | d4d889e329bd0837598b3ef611806421754e9b83 (diff) |
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.c | 4 |
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 07edd4067acc..42bbaf64aceb 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) | |||
327 | u8 ir_config; | 327 | u8 ir_config; |
328 | int err = -ENOMEM; | 328 | int err = -ENOMEM; |
329 | 329 | ||
330 | if (dev->ir_codes == NULL) { | 330 | if (dev->board.ir_codes == NULL) { |
331 | /* No remote control support */ | 331 | /* No remote control support */ |
332 | return 0; | 332 | return 0; |
333 | } | 333 | } |
@@ -366,7 +366,7 @@ int em28xx_ir_init(struct em28xx *dev) | |||
366 | usb_make_path(dev->udev, ir->phys, sizeof(ir->phys)); | 366 | usb_make_path(dev->udev, ir->phys, sizeof(ir->phys)); |
367 | strlcat(ir->phys, "/input0", sizeof(ir->phys)); | 367 | strlcat(ir->phys, "/input0", sizeof(ir->phys)); |
368 | 368 | ||
369 | ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER, dev->ir_codes); | 369 | ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER, dev->board.ir_codes); |
370 | input_dev->name = ir->name; | 370 | input_dev->name = ir->name; |
371 | input_dev->phys = ir->phys; | 371 | input_dev->phys = ir->phys; |
372 | input_dev->id.bustype = BUS_USB; | 372 | input_dev->id.bustype = BUS_USB; |