Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357185
b: refs/heads/master
c: 7a7ef46
h: refs/heads/master
i:
  357183: f580142
v: v3
  • Loading branch information
Antonio Ospite authored and Mauro Carvalho Chehab committed Dec 27, 2012
1 parent 8b3fa68 commit 0430f70
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: f526e9e1dcb65c8967c61bbfa72933f4553958ee
refs/heads/master: 7a7ef4657e84b5038eace08a1db5b480854c893e
3 changes: 2 additions & 1 deletion trunk/drivers/media/usb/dvb-usb/m920x.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,11 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0)
goto out;

m920x_parse_rc_state(d, rc_state[0], state);

for (i = 0; i < d->props.rc.legacy.rc_map_size; i++)
if (rc5_data(&d->props.rc.legacy.rc_map_table[i]) == rc_state[1]) {
*event = d->props.rc.legacy.rc_map_table[i].keycode;
m920x_parse_rc_state(d, rc_state[0], state);
goto out;
}

Expand Down

0 comments on commit 0430f70

Please sign in to comment.