diff options
| author | David Härdeman <david@hardeman.nu> | 2015-07-20 21:16:41 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-08-19 12:03:00 +0200 |
| commit | 3a03b86fdc1634e81d77f84e987c5a15426eff3d (patch) | |
| tree | be70e357df27b43053cc681a05519cc3a86c7b6f /drivers/media/rc/rc-main.c | |
| parent | Revert "[media] rc: rc-loopback: Add loopback of filter scancodes" (diff) | |
| download | linux-3a03b86fdc1634e81d77f84e987c5a15426eff3d.tar.xz linux-3a03b86fdc1634e81d77f84e987c5a15426eff3d.zip | |
Revert "[media] rc: rc-core: Add support for encode_wakeup drivers"
This reverts commit 0d830b2d1295fee82546d57185da5a6604f11ae2.
The current code is not mature enough, the API should allow a single
protocol to be specified. Also, the current code contains heuristics
that will depend on module load order.
Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Antti Seppälä <a.seppala@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/rc/rc-main.c')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 9d015db65280..0ff388a16168 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -865,8 +865,6 @@ static ssize_t show_protocols(struct device *device, } else { enabled = dev->enabled_wakeup_protocols; allowed = dev->allowed_wakeup_protocols; - if (dev->encode_wakeup && !allowed) - allowed = ir_raw_get_encode_protocols(); } mutex_unlock(&dev->lock); @@ -1408,16 +1406,13 @@ int rc_register_device(struct rc_dev *dev) path ? path : "N/A"); kfree(path); - if (dev->driver_type == RC_DRIVER_IR_RAW || dev->encode_wakeup) { + if (dev->driver_type == RC_DRIVER_IR_RAW) { /* Load raw decoders, if they aren't already */ if (!raw_init) { IR_dprintk(1, "Loading raw decoders\n"); ir_raw_init(); raw_init = true; } - } - - if (dev->driver_type == RC_DRIVER_IR_RAW) { /* calls ir_register_device so unlock mutex here*/ mutex_unlock(&dev->lock); rc = ir_raw_event_register(dev); |