From: David Härdeman Date: Mon, 1 May 2017 16:10:01 +0000 (-0300) Subject: [media] rc-core: img-ir - leave the internals of rc_dev alone X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a55a71da3db4acd5a374e0fb70a445266e71c6f1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [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 Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab --- 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;