diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-28 14:25:28 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-30 15:45:48 -0300 |
commit | d24b69fc6b0aca41a205b2b5abaf3f243ad7d48b (patch) | |
tree | 58522e0beaabfc8e94dbace1e3db1c5af391e5bd /drivers/media | |
parent | cfd0c77d0830d33288e9da17aa10db3a61de601a (diff) | |
download | op-kernel-dev-d24b69fc6b0aca41a205b2b5abaf3f243ad7d48b.zip op-kernel-dev-d24b69fc6b0aca41a205b2b5abaf3f243ad7d48b.tar.gz |
[media] rc-main: allow raw protocol drivers to restrict the allowed protos
On some hardware (au0828/au8522), the hardware is broken with
regards to the initial pulse detection. So, the driver needs to
produce a fake start pulse. That limits the acceptable protocols,
as it is not possible to produce a fake pulse that would cover
all supported protocols.
So, allow the driver to explicitly set the allowed protocols.
If the driver doesn't specify, keep the old behavior.
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/rc/rc-main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index dfceeb4..a7991c7 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -859,10 +859,9 @@ static ssize_t show_protocols(struct device *device, if (fattr->type == RC_FILTER_NORMAL) { enabled = dev->enabled_protocols; - if (dev->raw) + allowed = dev->allowed_protocols; + if (dev->raw && !allowed) allowed = ir_raw_get_allowed_protocols(); - else - allowed = dev->allowed_protocols; } else { enabled = dev->enabled_wakeup_protocols; allowed = dev->allowed_wakeup_protocols; |