diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-input.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index f8e985989ca0..9499000f66b6 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -460,7 +460,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
460 | int polling = 0; | 460 | int polling = 0; |
461 | int rc5_gpio = 0; | 461 | int rc5_gpio = 0; |
462 | int nec_gpio = 0; | 462 | int nec_gpio = 0; |
463 | int ir_type = IR_TYPE_OTHER; | 463 | u64 ir_type = IR_TYPE_OTHER; |
464 | int err; | 464 | int err; |
465 | 465 | ||
466 | if (dev->has_remote != SAA7134_REMOTE_GPIO) | 466 | if (dev->has_remote != SAA7134_REMOTE_GPIO) |
@@ -568,7 +568,8 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
568 | case SAA7134_BOARD_BEHOLD_407FM: | 568 | case SAA7134_BOARD_BEHOLD_407FM: |
569 | case SAA7134_BOARD_BEHOLD_409: | 569 | case SAA7134_BOARD_BEHOLD_409: |
570 | case SAA7134_BOARD_BEHOLD_505FM: | 570 | case SAA7134_BOARD_BEHOLD_505FM: |
571 | case SAA7134_BOARD_BEHOLD_505RDS: | 571 | case SAA7134_BOARD_BEHOLD_505RDS_MK5: |
572 | case SAA7134_BOARD_BEHOLD_505RDS_MK3: | ||
572 | case SAA7134_BOARD_BEHOLD_507_9FM: | 573 | case SAA7134_BOARD_BEHOLD_507_9FM: |
573 | case SAA7134_BOARD_BEHOLD_507RDS_MK3: | 574 | case SAA7134_BOARD_BEHOLD_507RDS_MK3: |
574 | case SAA7134_BOARD_BEHOLD_507RDS_MK5: | 575 | case SAA7134_BOARD_BEHOLD_507RDS_MK5: |
@@ -728,7 +729,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
728 | dev->remote = ir; | 729 | dev->remote = ir; |
729 | saa7134_ir_start(dev, ir); | 730 | saa7134_ir_start(dev, ir); |
730 | 731 | ||
731 | err = ir_input_register(ir->dev, ir_codes); | 732 | err = ir_input_register(ir->dev, ir_codes, NULL); |
732 | if (err) | 733 | if (err) |
733 | goto err_out_stop; | 734 | goto err_out_stop; |
734 | 735 | ||