From 0430f7069c06e059e3ee92ec7afc44bb1a7ac805 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 10 Dec 2012 17:37:13 -0300 Subject: [PATCH] --- yaml --- r: 357185 b: refs/heads/master c: 7a7ef4657e84b5038eace08a1db5b480854c893e h: refs/heads/master i: 357183: f580142959c2e8aacd6e8c6613daf36c8a5d135e v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/dvb-usb/m920x.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8bb3d7704a0..ad6d19e2aacb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f526e9e1dcb65c8967c61bbfa72933f4553958ee +refs/heads/master: 7a7ef4657e84b5038eace08a1db5b480854c893e diff --git a/trunk/drivers/media/usb/dvb-usb/m920x.c b/trunk/drivers/media/usb/dvb-usb/m920x.c index 581c5deffb6e..5f6ca753e293 100644 --- a/trunk/drivers/media/usb/dvb-usb/m920x.c +++ b/trunk/drivers/media/usb/dvb-usb/m920x.c @@ -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; }