aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-12-11 09:47:42 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-16 00:18:44 -0200
commit38ef6aa884e3fd389f7d444b8dd36c16832e36b4 (patch)
tree760c7f2f9528e7bc19dbb8b5d5384d473c207a73 /drivers/media/dvb/ttpci
parent75543cce0c1f46be495b981d8d3eda0882721d07 (diff)
downloadkernel_samsung_smdk4412-38ef6aa884e3fd389f7d444b8dd36c16832e36b4.zip
kernel_samsung_smdk4412-38ef6aa884e3fd389f7d444b8dd36c16832e36b4.tar.gz
kernel_samsung_smdk4412-38ef6aa884e3fd389f7d444b8dd36c16832e36b4.tar.bz2
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/ttpci')
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 7d193eb..9c9070a 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -286,7 +286,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
return 0;
out2:
- ir_input_free(input_dev);
+ ir_input_unregister(input_dev);
input_free_device(input_dev);
out1:
return error;
@@ -304,7 +304,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)
del_timer_sync(&dev->timer);
ir_input_nokey(dev, &budget_ci->ir.state);
- ir_input_free(dev);
+ ir_input_unregister(dev);
input_unregister_device(dev);
}