1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 9dc4e142726b..af0d935c29be 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -393,8 +393,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));
 
-        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER,
-                             dev->board.ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER);
         if (err < 0)
                 goto err_out_free;
 
@@ -413,7 +412,7 @@ int em28xx_ir_init(struct em28xx *dev)
         em28xx_ir_start(ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, dev->board.ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -422,8 +421,6 @@ int em28xx_ir_init(struct em28xx *dev)
         em28xx_ir_stop(ir);
         dev->ir = NULL;
  err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -438,7 +435,6 @@ int em28xx_ir_fini(struct em28xx *dev)
 
         em28xx_ir_stop(ir);
         ir_input_unregister(ir->input);
-        input_unregister_device(ir->input);
         kfree(ir);
 
         /* done */