V4L/DVB: Bug fix: make IR work again for dm1105
It makes IR to work again for dm1105 and, possibly, others. Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
033608c1f3
commit
84b14f181a
|
@ -490,11 +490,12 @@ int __ir_input_register(struct input_dev *input_dev,
|
|||
if (rc < 0)
|
||||
goto out_table;
|
||||
|
||||
if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
|
||||
rc = ir_raw_event_register(input_dev);
|
||||
if (rc < 0)
|
||||
goto out_event;
|
||||
}
|
||||
if (ir_dev->props)
|
||||
if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
|
||||
rc = ir_raw_event_register(input_dev);
|
||||
if (rc < 0)
|
||||
goto out_event;
|
||||
}
|
||||
|
||||
IR_dprintk(1, "Registered input device on %s for %s remote.\n",
|
||||
driver_name, rc_tab->name);
|
||||
|
@ -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->driver_type == RC_DRIVER_IR_RAW)
|
||||
ir_raw_event_unregister(input_dev);
|
||||
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);
|
||||
|
|
|
@ -221,9 +221,10 @@ int ir_register_class(struct input_dev *input_dev)
|
|||
if (unlikely(devno < 0))
|
||||
return devno;
|
||||
|
||||
if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
|
||||
ir_dev->dev.type = &rc_dev_type;
|
||||
else
|
||||
if (ir_dev->props) {
|
||||
if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
|
||||
ir_dev->dev.type = &rc_dev_type;
|
||||
} else
|
||||
ir_dev->dev.type = &ir_raw_dev_type;
|
||||
|
||||
ir_dev->dev.class = &ir_input_class;
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue