aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/mantis/mantis_input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index 487d149c802d..6a9df779441f 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -118,7 +118,7 @@ int mantis_input_init(struct mantis_pci *mantis)
118 rc->name = name; 118 rc->name = name;
119 rc->phys = dev; 119 rc->phys = dev;
120 120
121 ir_input_init(rc, &rc_state, IR_TYPE_OTHER, &ir_mantis); 121 ir_input_init(rc, &rc_state, IR_TYPE_OTHER);
122 122
123 rc->id.bustype = BUS_PCI; 123 rc->id.bustype = BUS_PCI;
124 rc->id.vendor = mantis->vendor_id; 124 rc->id.vendor = mantis->vendor_id;
@@ -126,7 +126,7 @@ int mantis_input_init(struct mantis_pci *mantis)
126 rc->id.version = 1; 126 rc->id.version = 1;
127 rc->dev = mantis->pdev->dev; 127 rc->dev = mantis->pdev->dev;
128 128
129 err = input_register_device(rc); 129 err = ir_input_register(rc, &ir_mantis);
130 if (err) { 130 if (err) {
131 dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err); 131 dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
132 input_free_device(rc); 132 input_free_device(rc);
@@ -142,7 +142,7 @@ int mantis_exit(struct mantis_pci *mantis)
142{ 142{
143 struct input_dev *rc = mantis->rc; 143 struct input_dev *rc = mantis->rc;
144 144
145 input_unregister_device(rc); 145 ir_input_unregister(rc);
146 146
147 return 0; 147 return 0;
148} 148}