From 6709237d3a6e19a6e8a25db2cc3a27696cdc6a68 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 14 Dec 2009 02:46:42 -0300
Subject: [PATCH] --- yaml --- r: 181412 b: refs/heads/master c:
 09b01b90eb08769a64159ff4f81efe4badf6a49b h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/media/IR/ir-sysfs.c | 44 ++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9a5a50646797..a57f71c9c0dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53f870228db0855f2031270ba5774dab0f33facd
+refs/heads/master: 09b01b90eb08769a64159ff4f81efe4badf6a49b
diff --git a/trunk/drivers/media/IR/ir-sysfs.c b/trunk/drivers/media/IR/ir-sysfs.c
index 821345dbe7c9..aede78ddbace 100644
--- a/trunk/drivers/media/IR/ir-sysfs.c
+++ b/trunk/drivers/media/IR/ir-sysfs.c
@@ -47,8 +47,50 @@ static ssize_t show_protocol(struct device *d,
 	return sprintf(buf, "%s\n", s);
 }
 
+
+static ssize_t store_protocol(struct device *d,
+			      struct device_attribute *mattr,
+			      const char *data,
+			      size_t len)
+{
+	struct ir_input_dev *ir_dev = dev_get_drvdata(d);
+	enum ir_type ir_type = IR_TYPE_UNKNOWN;
+	int rc = -EINVAL;
+	char *buf;
+
+	buf = strsep((char **) &data, "\n");
+
+	if (!strcasecmp(buf, "rc-5"))
+		ir_type = IR_TYPE_RC5;
+	else if (!strcasecmp(buf, "pd"))
+		ir_type = IR_TYPE_PD;
+	else if (!strcasecmp(buf, "nec"))
+		ir_type = IR_TYPE_NEC;
+
+	if (ir_type == IR_TYPE_UNKNOWN) {
+		IR_dprintk(1, "Error setting protocol to %ld\n", ir_type);
+		return -EINVAL;
+	}
+
+	if (ir_dev->props->change_protocol)
+		rc = ir_dev->props->change_protocol(ir_dev->props->priv,
+						    ir_type);
+
+	if (rc < 0) {
+		IR_dprintk(1, "Error setting protocol to %ld\n", ir_type);
+		return -EINVAL;
+	}
+
+	ir_dev->rc_tab.ir_type = ir_type;
+
+	IR_dprintk(1, "Current protocol is %ld\n", ir_type);
+
+	return len;
+}
+
+
 static DEVICE_ATTR(current_protocol, S_IRUGO | S_IWUSR,
-		   show_protocol, NULL);
+		   show_protocol, store_protocol);
 
 static struct attribute *ir_dev_attrs[] = {
 	&dev_attr_current_protocol.attr,