diff options
| author | David Härdeman <david@hardeman.nu> | 2017-05-01 19:10:01 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-06-06 15:08:50 +0300 |
| commit | a55a71da3db4acd5a374e0fb70a445266e71c6f1 (patch) | |
| tree | 279e454bcb7f9ae1b94f74b7f222737fe8c94eec /drivers/media/rc/img-ir | |
| parent | a387ffc8043b8b894cdc9d3f134b52d9c492ac26 (diff) | |
| download | linux-a55a71da3db4acd5a374e0fb70a445266e71c6f1.tar.xz | |
[media] rc-core: img-ir - leave the internals of rc_dev alone
Changing the protocol does not imply that the keymap changes.
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc/img-ir')
| -rw-r--r-- | drivers/media/rc/img-ir/img-ir-hw.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/rc/img-ir/img-ir-hw.c b/drivers/media/rc/img-ir/img-ir-hw.c index 431d33b36fb0..8d1439622533 100644 --- a/drivers/media/rc/img-ir/img-ir-hw.c +++ b/drivers/media/rc/img-ir/img-ir-hw.c @@ -702,10 +702,6 @@ static void img_ir_set_protocol(struct img_ir_priv *priv, u64 proto) { struct rc_dev *rdev = priv->hw.rdev; - spin_lock_irq(&rdev->rc_map.lock); - rdev->rc_map.rc_type = __ffs64(proto); - spin_unlock_irq(&rdev->rc_map.lock); - mutex_lock(&rdev->lock); rdev->enabled_protocols = proto; rdev->allowed_wakeup_protocols = proto; |