diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-11 07:47:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-15 21:18:44 -0500 |
commit | 38ef6aa884e3fd389f7d444b8dd36c16832e36b4 (patch) | |
tree | 760c7f2f9528e7bc19dbb8b5d5384d473c207a73 /drivers/media/dvb/dm1105/dm1105.c | |
parent | 75543cce0c1f46be495b981d8d3eda0882721d07 (diff) |
V4L/DVB (13616): IR: rename ir_input_free as ir_input_unregister
Now, ir_input_free does more than just freeing the keytab. Better to
rename it as ir_input_unregister.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dm1105/dm1105.c')
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 53e3f2a7d31a..34e4e569cc7d 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -613,7 +613,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) | |||
613 | 613 | ||
614 | err = input_register_device(input_dev); | 614 | err = input_register_device(input_dev); |
615 | if (err) { | 615 | if (err) { |
616 | ir_input_free(input_dev); | 616 | ir_input_unregister(input_dev); |
617 | input_free_device(input_dev); | 617 | input_free_device(input_dev); |
618 | return err; | 618 | return err; |
619 | } | 619 | } |
@@ -623,7 +623,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) | |||
623 | 623 | ||
624 | void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105) | 624 | void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105) |
625 | { | 625 | { |
626 | ir_input_free(dm1105->ir.input_dev); | 626 | ir_input_unregister(dm1105->ir.input_dev); |
627 | input_unregister_device(dm1105->ir.input_dev); | 627 | input_unregister_device(dm1105->ir.input_dev); |
628 | } | 628 | } |
629 | 629 | ||