summaryrefslogtreecommitdiffstats
path: root/drivers/media/IR
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-12-16 23:46:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 15:10:24 -0300
commit0f7ff39532f1d2328e54b65ce5022c71f06e44d6 (patch)
tree800e335ced1e2685611797d63fcdf6ed4f92de9c /drivers/media/IR
parentcd79d33e168dba0d7de32c5bf010e20cff184b2a (diff)
downloadlinux-0f7ff39532f1d2328e54b65ce5022c71f06e44d6.tar.bz2
V4L/DVB (13825): ir-core: Don't OOPS if IR device props is not defined
As currently most drivers don't define ir_dev->props, we shouldn't assume that this field is defined. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR')
-rw-r--r--drivers/media/IR/ir-sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index d67c11d9921f..6ec7f89d5142 100644
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -97,7 +97,7 @@ static ssize_t store_protocol(struct device *d,
return -EINVAL;
}
- if (ir_dev->props->change_protocol)
+ if (ir_dev->props && ir_dev->props->change_protocol)
rc = ir_dev->props->change_protocol(ir_dev->props->priv,
ir_type);