summaryrefslogtreecommitdiff
path: root/drivers/media/IR/ir-sysfs.c
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2010-05-26 23:31:21 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 01:24:20 -0300
commit84b14f181a36eea6591779156ef356f8d198bbfd (patch)
tree00236d1d995705056c916029d2f9c23f3ed2b05c /drivers/media/IR/ir-sysfs.c
parent033608c1f33bcacba8d3a960240a7b2900b1d5ff (diff)
V4L/DVB: Bug fix: make IR work again for dm1105
It makes IR to work again for dm1105 and, possibly, others. Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR/ir-sysfs.c')
-rw-r--r--drivers/media/IR/ir-sysfs.c7
1 files changed, 4 insertions, 3 deletions
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;