evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions

Browse source 
Fix a merge conflict between mantis and IR cleanups

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2009-12-16 23:57:27 -02:00
parent 8825a0970c
commit 9c0832e399
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/dvb/mantis/mantis_input.c
View file

@ -118,7 +118,7 @@ int mantis_input_init(struct mantis_pci *mantis)
rc->name = name; rc->name = name;
rc->phys = dev; 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.bustype = BUS_PCI;
rc->id.vendor = mantis->vendor_id; rc->id.vendor = mantis->vendor_id;
@ -126,7 +126,7 @@ int mantis_input_init(struct mantis_pci *mantis)
rc->id.version = 1; rc->id.version = 1;
rc->dev = mantis->pdev->dev; rc->dev = mantis->pdev->dev;
err = input_register_device(rc); err = ir_input_register(rc, &ir_mantis);
if (err) { if (err) {
dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err); dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
input_free_device(rc); input_free_device(rc);
@ -142,7 +142,7 @@ int mantis_exit(struct mantis_pci *mantis)
{ {
struct input_dev *rc = mantis->rc; struct input_dev *rc = mantis->rc;
input_unregister_device(rc); ir_input_unregister(rc);
return 0; return 0;
} }