---

yaml --- r: 179549 b: refs/heads/master c: 9c0832e h: refs/heads/master i: 179547: 999c214 v: v3
git-mirror · Jan 17, 2010 · a004af8 · a004af8
1 parent 68c2b3b
commit a004af8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8825a0970cef408fb2f1a44e3cb05d6ba41a18db
+refs/heads/master: 9c0832e3990b541ea1b8f5d44fe4c204a5e7d396
diff --git a/trunk/drivers/media/dvb/mantis/mantis_input.c b/trunk/drivers/media/dvb/mantis/mantis_input.c
@@ -118,15 +118,15 @@ int mantis_input_init(struct mantis_pci *mantis)
 	rc->name = name;
 	rc->phys = dev;
 
-	ir_input_init(rc, &rc_state, IR_TYPE_OTHER, &ir_mantis);
+	ir_input_init(rc, &rc_state, IR_TYPE_OTHER);
 
 	rc->id.bustype	= BUS_PCI;
 	rc->id.vendor	= mantis->vendor_id;
 	rc->id.product	= mantis->device_id;
 	rc->id.version	= 1;
 	rc->dev		= mantis->pdev->dev;
 
-	err = input_register_device(rc);
+	err = ir_input_register(rc, &ir_mantis);
 	if (err) {
 		dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
 		input_free_device(rc);
@@ -142,7 +142,7 @@ int mantis_exit(struct mantis_pci *mantis)
 {
 	struct input_dev *rc = mantis->rc;
 
-	input_unregister_device(rc);
+	ir_input_unregister(rc);
 
 	return 0;
 }