Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84b14f18 authored by Igor M. Liplianin's avatar Igor M. Liplianin Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: Bug fix: make IR work again for dm1105 



It makes IR to work again for dm1105 and, possibly, others.

Signed-off-by: default avatarIgor M. Liplianin <liplianin@me.by>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 033608c1

drivers/media/IR/ir-keytable.c

+10 −7
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ int __ir_input_register(struct input_dev *input_dev, 
	if (rc < 0)

		goto out_table;



	if (ir_dev->props)

		if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {

			rc = ir_raw_event_register(input_dev);

			if (rc < 0)
@@ -530,8 +531,10 @@ void ir_input_unregister(struct input_dev *input_dev) 
	IR_dprintk(1, "Freed keycode table\n");



	del_timer_sync(&ir_dev->timer_keyup);

	if (ir_dev->props)

		if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)

			ir_raw_event_unregister(input_dev);



	rc_tab = &ir_dev->rc_tab;

	rc_tab->size = 0;

	kfree(rc_tab->scan);

drivers/media/IR/ir-sysfs.c

+4 −3
Original line number Diff line number Diff line
@@ -221,9 +221,10 @@ int ir_register_class(struct input_dev *input_dev) 
	if (unlikely(devno < 0))

		return devno;



	if (ir_dev->props) {

		if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)

			ir_dev->dev.type = &rc_dev_type;

	else

	} else

		ir_dev->dev.type = &ir_raw_dev_type;



	ir_dev->dev.class = &ir_input_class;

drivers/media/dvb/dm1105/dm1105.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static irqreturn_t dm1105_irq(int irq, void *dev_id) 
int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)

{

	struct input_dev *input_dev;

	char *ir_codes = NULL;

	char *ir_codes = RC_MAP_DM1105_NEC;

	int err = -ENOMEM;



	input_dev = input_allocate_device();