V4L/DVB: IR: only initially registers protocol that matches loaded keymap

[karo-tx-linux.git] / drivers / media / IR / ir-rc6-decoder.c

diff --git a/drivers/media/IR/ir-rc6-decoder.c b/drivers/media/IR/ir-rc6-decoder.c
index 2bf479f4f1bc6c3c42b66d161a48a40d46e4a134..9f61da29faceeb416f348f7061a20080361d641f 100644 (file)
--- a/drivers/media/IR/ir-rc6-decoder.c
+++ b/drivers/media/IR/ir-rc6-decoder.c
@@ -352,6 +352,7 @@ static int ir_rc6_register(struct input_dev *input_dev)
 {
        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
        struct decoder_data *data;
+       u64 ir_type = ir_dev->rc_tab.ir_type;
        int rc;
 
        rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
@@ -365,7 +366,8 @@ static int ir_rc6_register(struct input_dev *input_dev)
        }
 
        data->ir_dev = ir_dev;
-       data->enabled = 1;
+       if (ir_type == IR_TYPE_RC6 || ir_type == IR_TYPE_UNKNOWN)
+               data->enabled = 1;
 
        spin_lock(&decoder_lock);
        list_add_tail(&data->list, &decoder_list);