3 files changed, 30 insertions, 14 deletions

diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index af7400bc906f..1fdb528737fe 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -488,11 +488,19 @@ int __ir_input_register(struct input_dev *input_dev,
         if (rc < 0)
                 goto out_table;
 
+        if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
+                rc = ir_raw_event_register(input_dev);
+                if (rc < 0)
+                        goto out_event;
+        }
+
         IR_dprintk(1, "Registered input device on %s for %s remote.\n",
                    driver_name, rc_tab->name);
 
         return 0;
 
+out_event:
+        ir_unregister_class(input_dev);
 out_table:
         kfree(ir_dev->rc_tab.scan);
 out_name:
@@ -509,22 +517,25 @@ EXPORT_SYMBOL_GPL(__ir_input_register);
 
  * This routine is used to free memory and de-register interfaces.
  */
-void ir_input_unregister(struct input_dev *dev)
+void ir_input_unregister(struct input_dev *input_dev)
 {
-        struct ir_input_dev *ir_dev = input_get_drvdata(dev);
+        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
         struct ir_scancode_table *rc_tab;
 
         if (!ir_dev)
                 return;
 
         IR_dprintk(1, "Freed keycode table\n");
+
         del_timer_sync(&ir_dev->timer_keyup);
+        if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)
+                ir_raw_event_unregister(input_dev);
         rc_tab = &ir_dev->rc_tab;
         rc_tab->size = 0;
         kfree(rc_tab->scan);
         rc_tab->scan = NULL;
 
-        ir_unregister_class(dev);
+        ir_unregister_class(input_dev);
 
         kfree(ir_dev->driver_name);
         kfree(ir_dev);
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index ddb3365adc82..bc4ca08adf4a 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -82,7 +82,6 @@ int ir_raw_event_register(struct input_dev *input_dev)
 
         return rc;
 }
-EXPORT_SYMBOL_GPL(ir_raw_event_register);
 
 void ir_raw_event_unregister(struct input_dev *input_dev)
 {
@@ -97,7 +96,6 @@ void ir_raw_event_unregister(struct input_dev *input_dev)
         kfree(ir->raw);
         ir->raw = NULL;
 }
-EXPORT_SYMBOL_GPL(ir_raw_event_unregister);
 
 int ir_raw_event_store(struct input_dev *input_dev, enum raw_event_type type)
 {
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index c33333f1f60e..81eebd8eae5a 100644
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -152,22 +152,26 @@ static int ir_dev_uevent(struct device *device, struct kobj_uevent_env *env)
 static DEVICE_ATTR(current_protocol, S_IRUGO | S_IWUSR,
                    show_protocol, store_protocol);
 
-static struct attribute *ir_dev_attrs[] = {
+static struct attribute *ir_hw_dev_attrs[] = {
         &dev_attr_current_protocol.attr,
         NULL,
 };
 
-static struct attribute_group ir_dev_attr_grp = {
-        .attrs  = ir_dev_attrs,
+static struct attribute_group ir_hw_dev_attr_grp = {
+        .attrs  = ir_hw_dev_attrs,
 };
 
-static const struct attribute_group *ir_dev_attr_groups[] = {
-        &ir_dev_attr_grp,
+static const struct attribute_group *ir_hw_dev_attr_groups[] = {
+        &ir_hw_dev_attr_grp,
         NULL
 };
 
-static struct device_type ir_dev_type = {
-        .groups         = ir_dev_attr_groups,
+static struct device_type rc_dev_type = {
+        .groups         = ir_hw_dev_attr_groups,
+        .uevent         = ir_dev_uevent,
+};
+
+static struct device_type ir_raw_dev_type = {
         .uevent         = ir_dev_uevent,
 };
 
@@ -181,7 +185,6 @@ int ir_register_class(struct input_dev *input_dev)
 {
         int rc;
         const char *path;
-
         struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
         int devno = find_first_zero_bit(&ir_core_dev_number,
                                         IRRCV_NUM_DEVICES);
@@ -189,7 +192,11 @@ int ir_register_class(struct input_dev *input_dev)
         if (unlikely(devno < 0))
                 return devno;
 
-        ir_dev->dev.type = &ir_dev_type;
+        if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
+                ir_dev->dev.type = &rc_dev_type;
+        else
+                ir_dev->dev.type = &ir_raw_dev_type;
+
         ir_dev->dev.class = &ir_input_class;
         ir_dev->dev.parent = input_dev->dev.parent;
         dev_set_name(&ir_dev->dev, "rc%d", devno);