3 files changed, 15 insertions, 11 deletions

diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 9374a006f43d..94a8577e72eb 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -490,11 +490,12 @@ 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;
-        }
+        if (ir_dev->props)
+                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);
@@ -530,8 +531,10 @@ void ir_input_unregister(struct input_dev *input_dev)
         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);
+        if (ir_dev->props)
+                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);
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index d7da63e16c92..2098dd1488e0 100644
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -221,9 +221,10 @@ int ir_register_class(struct input_dev *input_dev)
         if (unlikely(devno < 0))
                 return devno;
 
-        if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
-                ir_dev->dev.type = &rc_dev_type;
-        else
+        if (ir_dev->props) {
+                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;
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index b762e561a6d5..bca07c0bcd01 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -594,7 +594,7 @@ static irqreturn_t dm1105_irq(int irq, void *dev_id)
 int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
 {
         struct input_dev *input_dev;
-        char *ir_codes = NULL;
+        char *ir_codes = RC_MAP_DM1105_NEC;
         int err = -ENOMEM;
 
         input_dev = input_allocate_device();