1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 8e7f2929fa6f..d9c1f2ff7119 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -795,7 +795,9 @@ static const struct {
         { RC_BIT_UNKNOWN,       "unknown",      NULL                    },
         { RC_BIT_RC5 |
           RC_BIT_RC5X,          "rc-5",         "ir-rc5-decoder"        },
-        { RC_BIT_NEC,           "nec",          "ir-nec-decoder"        },
+        { RC_BIT_NEC |
+          RC_BIT_NECX |
+          RC_BIT_NEC32,         "nec",          "ir-nec-decoder"        },
         { RC_BIT_RC6_0 |
           RC_BIT_RC6_6A_20 |
           RC_BIT_RC6_6A_24 |
@@ -1460,6 +1462,10 @@ int rc_register_device(struct rc_dev *dev)
         dev->input_dev->phys = dev->input_phys;
         dev->input_dev->name = dev->input_name;
 
+        rc = input_register_device(dev->input_dev);
+        if (rc)
+                goto out_table;
+
         /*
          * Default delay of 250ms is too short for some protocols, especially
          * since the timeout is currently set to 250ms. Increase it to 500ms,
@@ -1475,11 +1481,6 @@ int rc_register_device(struct rc_dev *dev)
          */
         dev->input_dev->rep[REP_PERIOD] = 125;
 
-        /* rc_open will be called here */
-        rc = input_register_device(dev->input_dev);
-        if (rc)
-                goto out_table;
-
         path = kobject_get_path(&dev->dev.kobj, GFP_KERNEL);
         dev_info(&dev->dev, "%s as %s\n",
                 dev->input_name ?: "Unspecified device", path ?: "N/A");