From 42a461b0ff9053b788b3b42996d08b34ddd47f53 Mon Sep 17 00:00:00 2001 From: Kevin Baradon Date: Mon, 18 Feb 2013 15:10:22 -0300 Subject: [PATCH] --- yaml --- r: 366665 b: refs/heads/master c: e9e7a16d6da4af030ccb117079dcf1ef66bd5804 h: refs/heads/master i: 366663: f427186109d2d77019fb2f076b4fcc48039808d3 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/imon.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 28695d245131..54b077e9ae67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26ccbec44a7c62de4fef4f33bb858963e501921d +refs/heads/master: e9e7a16d6da4af030ccb117079dcf1ef66bd5804 diff --git a/trunk/drivers/media/rc/imon.c b/trunk/drivers/media/rc/imon.c index 178b94660b58..b8f9f85a11c9 100644 --- a/trunk/drivers/media/rc/imon.c +++ b/trunk/drivers/media/rc/imon.c @@ -1573,11 +1573,6 @@ static void imon_incoming_packet(struct imon_context *ictx, if (press_type < 0) goto not_input_data; - spin_lock_irqsave(&ictx->kc_lock, flags); - if (ictx->kc == KEY_UNKNOWN) - goto unknown_key; - spin_unlock_irqrestore(&ictx->kc_lock, flags); - if (ktype != IMON_KEY_PANEL) { if (press_type == 0) rc_keyup(ictx->rdev); @@ -1620,12 +1615,6 @@ static void imon_incoming_packet(struct imon_context *ictx, return; -unknown_key: - spin_unlock_irqrestore(&ictx->kc_lock, flags); - dev_info(dev, "%s: unknown keypress, code 0x%llx\n", __func__, - (long long)scancode); - return; - not_input_data: if (len != 8) { dev_warn(dev, "imon %s: invalid incoming packet "