From a004af8bc71e6a102658a84cd46c10e999920c13 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 16 Dec 2009 23:57:27 -0200 Subject: [PATCH] --- yaml --- r: 179549 b: refs/heads/master c: 9c0832e3990b541ea1b8f5d44fe4c204a5e7d396 h: refs/heads/master i: 179547: 999c21462fcf60505e4cac746f53fbc9a363442d v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_input.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 93361bfe6528..787e7e368490 100644 --- 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 index 487d149c802d..6a9df779441f 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_input.c +++ b/trunk/drivers/media/dvb/mantis/mantis_input.c @@ -118,7 +118,7 @@ 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; @@ -126,7 +126,7 @@ int mantis_input_init(struct mantis_pci *mantis) 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; }