Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 366665
b: refs/heads/master
c: e9e7a16
h: refs/heads/master
i:
  366663: f427186
v: v3
  • Loading branch information
Kevin Baradon authored and Mauro Carvalho Chehab committed Mar 21, 2013
1 parent d62d4ba commit 42a461b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26ccbec44a7c62de4fef4f33bb858963e501921d
refs/heads/master: e9e7a16d6da4af030ccb117079dcf1ef66bd5804
11 changes: 0 additions & 11 deletions trunk/drivers/media/rc/imon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 "
Expand Down

0 comments on commit 42a461b

Please sign in to comment.