diff options
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-input.c')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c index 277a092e1214..b320dbd635aa 100644 --- a/drivers/media/video/bt8xx/bttv-input.c +++ b/drivers/media/video/bt8xx/bttv-input.c | |||
| @@ -247,7 +247,7 @@ int bttv_input_init(struct bttv *btv) | |||
| 247 | struct card_ir *ir; | 247 | struct card_ir *ir; |
| 248 | struct ir_scancode_table *ir_codes = NULL; | 248 | struct ir_scancode_table *ir_codes = NULL; |
| 249 | struct input_dev *input_dev; | 249 | struct input_dev *input_dev; |
| 250 | int ir_type = IR_TYPE_OTHER; | 250 | u64 ir_type = IR_TYPE_OTHER; |
| 251 | int err = -ENOMEM; | 251 | int err = -ENOMEM; |
| 252 | 252 | ||
| 253 | if (!btv->has_remote) | 253 | if (!btv->has_remote) |
| @@ -389,7 +389,7 @@ int bttv_input_init(struct bttv *btv) | |||
| 389 | bttv_ir_start(btv, ir); | 389 | bttv_ir_start(btv, ir); |
| 390 | 390 | ||
| 391 | /* all done */ | 391 | /* all done */ |
| 392 | err = ir_input_register(btv->remote->dev, ir_codes); | 392 | err = ir_input_register(btv->remote->dev, ir_codes, NULL); |
| 393 | if (err) | 393 | if (err) |
| 394 | goto err_out_stop; | 394 | goto err_out_stop; |
| 395 | 395 | ||
