From 9a2baf4e5eca9a96e6a25368a74abf7c55243a2f Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Fri, 6 Jul 2012 23:27:57 -0300 Subject: [PATCH] --- yaml --- r: 320681 b: refs/heads/master c: 720bb6436ff30fccad05cf5bdf961ea5b1f5686d h: refs/heads/master i: 320679: 3c97dcfb45612c6d90951eabd1c8b51549d10418 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/rc-main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e534c709261..45f92d65bde4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f695d3f07bf9fd2914d18d1d2f89e3574b809ff +refs/heads/master: 720bb6436ff30fccad05cf5bdf961ea5b1f5686d diff --git a/trunk/drivers/media/rc/rc-main.c b/trunk/drivers/media/rc/rc-main.c index 6e16b09c24a9..cabc19c10515 100644 --- a/trunk/drivers/media/rc/rc-main.c +++ b/trunk/drivers/media/rc/rc-main.c @@ -775,10 +775,11 @@ static ssize_t show_protocols(struct device *device, if (dev->driver_type == RC_DRIVER_SCANCODE) { enabled = dev->rc_map.rc_type; allowed = dev->allowed_protos; - } else { + } else if (dev->raw) { enabled = dev->raw->enabled_protocols; allowed = ir_raw_get_allowed_protocols(); - } + } else + return -ENODEV; IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n", (long long)allowed,