From 611009333efbbee509eea0ccb78b5962d29455a6 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 1 Jun 2010 17:27:07 -0300
Subject: [PATCH] --- yaml --- r: 201935 b: refs/heads/master c:
 7366646e20f8800433333a7102e3ce488215e33f h: refs/heads/master i:   201933:
 5ac8859bb089ee8f98ebd374b39410e944b8dc93   201931:
 14c14259dcaf0daee3989e9f929b8d9f68f76dc5   201927:
 59d26b3b5d9fde70dddc80e7b7e91bc1bd84304c   201919:
 0c2d3e0f9ac6d9f3aefe3012942e44992303363f v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/IR/ir-jvc-decoder.c  | 4 +++-
 trunk/drivers/media/IR/ir-nec-decoder.c  | 4 +++-
 trunk/drivers/media/IR/ir-rc5-decoder.c  | 4 +++-
 trunk/drivers/media/IR/ir-rc6-decoder.c  | 4 +++-
 trunk/drivers/media/IR/ir-sony-decoder.c | 4 +++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index defc6624764b..0bae52fbd45f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2284261113f09bca4d362f5d51c008b65f55b6a
+refs/heads/master: 7366646e20f8800433333a7102e3ce488215e33f
diff --git a/trunk/drivers/media/IR/ir-jvc-decoder.c b/trunk/drivers/media/IR/ir-jvc-decoder.c
index 0b804944cbb0..b02e8013b9bb 100644
--- a/trunk/drivers/media/IR/ir-jvc-decoder.c
+++ b/trunk/drivers/media/IR/ir-jvc-decoder.c
@@ -253,6 +253,7 @@ static int ir_jvc_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);
@@ -266,7 +267,8 @@ static int ir_jvc_register(struct input_dev *input_dev)
 	}
 
 	data->ir_dev = ir_dev;
-	data->enabled = 1;
+	if (ir_type == IR_TYPE_JVC || ir_type == IR_TYPE_UNKNOWN)
+		data->enabled = 1;
 
 	spin_lock(&decoder_lock);
 	list_add_tail(&data->list, &decoder_list);
diff --git a/trunk/drivers/media/IR/ir-nec-decoder.c b/trunk/drivers/media/IR/ir-nec-decoder.c
index ba79233112ef..6059a1f1e151 100644
--- a/trunk/drivers/media/IR/ir-nec-decoder.c
+++ b/trunk/drivers/media/IR/ir-nec-decoder.c
@@ -260,6 +260,7 @@ static int ir_nec_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);
@@ -273,7 +274,8 @@ static int ir_nec_register(struct input_dev *input_dev)
 	}
 
 	data->ir_dev = ir_dev;
-	data->enabled = 1;
+	if (ir_type == IR_TYPE_NEC || ir_type == IR_TYPE_UNKNOWN)
+		data->enabled = 1;
 
 	spin_lock(&decoder_lock);
 	list_add_tail(&data->list, &decoder_list);
diff --git a/trunk/drivers/media/IR/ir-rc5-decoder.c b/trunk/drivers/media/IR/ir-rc5-decoder.c
index 23cdb1b1a3bc..4aa797bc69fd 100644
--- a/trunk/drivers/media/IR/ir-rc5-decoder.c
+++ b/trunk/drivers/media/IR/ir-rc5-decoder.c
@@ -256,6 +256,7 @@ static int ir_rc5_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);
@@ -269,7 +270,8 @@ static int ir_rc5_register(struct input_dev *input_dev)
 	}
 
 	data->ir_dev = ir_dev;
-	data->enabled = 1;
+	if (ir_type == IR_TYPE_RC5 || ir_type == IR_TYPE_UNKNOWN)
+		data->enabled = 1;
 
 	spin_lock(&decoder_lock);
 	list_add_tail(&data->list, &decoder_list);
diff --git a/trunk/drivers/media/IR/ir-rc6-decoder.c b/trunk/drivers/media/IR/ir-rc6-decoder.c
index 2bf479f4f1bc..9f61da29face 100644
--- a/trunk/drivers/media/IR/ir-rc6-decoder.c
+++ b/trunk/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);
diff --git a/trunk/drivers/media/IR/ir-sony-decoder.c b/trunk/drivers/media/IR/ir-sony-decoder.c
index 9f440c5c060d..219075ffd6b7 100644
--- a/trunk/drivers/media/IR/ir-sony-decoder.c
+++ b/trunk/drivers/media/IR/ir-sony-decoder.c
@@ -245,6 +245,7 @@ static int ir_sony_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);
@@ -258,7 +259,8 @@ static int ir_sony_register(struct input_dev *input_dev)
 	}
 
 	data->ir_dev = ir_dev;
-	data->enabled = 1;
+	if (ir_type == IR_TYPE_SONY || ir_type == IR_TYPE_UNKNOWN)
+		data->enabled = 1;
 
 	spin_lock(&decoder_lock);
 	list_add_tail(&data->list, &decoder_list);