V4L/DVB: ir-core: fix some confusing comments

[pandora-kernel.git] / drivers / media / IR / ir-sysfs.c

diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index 073b5c0..002b141 100644 (file)
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -1,4 +1,4 @@
-/* ir-register.c - handle IR scancode->keycode tables
+/* ir-sysfs.c - sysfs interface for RC devices (/sys/class/rc)
  *
  * Copyright (C) 2009-2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *
@@ -63,6 +63,10 @@ static ssize_t show_protocol(struct device *d,
                s = "nec";
        else if (ir_type == IR_TYPE_RC6)
                s = "rc6";
+       else if (ir_type == IR_TYPE_JVC)
+               s = "jvc";
+       else if (ir_type == IR_TYPE_SONY)
+               s = "sony";
        else
                s = "other";
 
@@ -100,6 +104,10 @@ static ssize_t store_protocol(struct device *d,
                        ir_type |= IR_TYPE_PD;
                if (!strcasecmp(buf, "nec"))
                        ir_type |= IR_TYPE_NEC;
+               if (!strcasecmp(buf, "jvc"))
+                       ir_type |= IR_TYPE_JVC;
+               if (!strcasecmp(buf, "sony"))
+                       ir_type |= IR_TYPE_SONY;
        }
 
        if (!ir_type) {
@@ -162,9 +170,9 @@ static int ir_dev_uevent(struct device *device, struct kobj_uevent_env *env)
        struct ir_input_dev *ir_dev = dev_get_drvdata(device);
 
        if (ir_dev->rc_tab.name)
-               ADD_HOTPLUG_VAR("NAME=\"%s\"", ir_dev->rc_tab.name);
+               ADD_HOTPLUG_VAR("NAME=%s", ir_dev->rc_tab.name);
        if (ir_dev->driver_name)
-               ADD_HOTPLUG_VAR("DRV_NAME=\"%s\"", ir_dev->driver_name);
+               ADD_HOTPLUG_VAR("DRV_NAME=%s", ir_dev->driver_name);
 
        return 0;
 }
@@ -287,8 +295,6 @@ static int __init ir_core_init(void)
 
        /* Initialize/load the decoders/keymap code that will be used */
        ir_raw_init();
-       rc_map_init();
-
 
        return 0;
 }