diff options
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-input.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c index 469e083dd5f8..2a5e4d959e8e 100644 --- a/drivers/media/video/cx23885/cx23885-input.c +++ b/drivers/media/video/cx23885/cx23885-input.c | |||
@@ -407,7 +407,7 @@ err_out_stop: | |||
407 | cx23885_input_ir_stop(dev); | 407 | cx23885_input_ir_stop(dev); |
408 | dev->ir_input = NULL; | 408 | dev->ir_input = NULL; |
409 | err_out_free: | 409 | err_out_free: |
410 | ir_input_free(input_dev); | 410 | ir_input_unregister(input_dev); |
411 | input_free_device(input_dev); | 411 | input_free_device(input_dev); |
412 | kfree(ir); | 412 | kfree(ir); |
413 | return ret; | 413 | return ret; |
@@ -420,7 +420,7 @@ void cx23885_input_fini(struct cx23885_dev *dev) | |||
420 | 420 | ||
421 | if (dev->ir_input == NULL) | 421 | if (dev->ir_input == NULL) |
422 | return; | 422 | return; |
423 | ir_input_free(dev->ir_input->dev); | 423 | ir_input_unregister(dev->ir_input->dev); |
424 | input_unregister_device(dev->ir_input->dev); | 424 | input_unregister_device(dev->ir_input->dev); |
425 | kfree(dev->ir_input); | 425 | kfree(dev->ir_input); |
426 | dev->ir_input = NULL; | 426 | dev->ir_input = NULL; |