Skip to content

Commit

Permalink
[media] cinergyT2-core: handle error code on RC query
Browse files Browse the repository at this point in the history
There's no sense on decoding and generating a RC key code if
there was an error on the URB control message.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Mauro Carvalho Chehab committed Oct 14, 2016
1 parent 5ef8ed0 commit 54d577a
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/media/usb/dvb-usb/cinergyT2-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
/* Copy this pointer as we are gonna need it in the release phase */
cinergyt2_usb_device = adap->dev;

return 0;
return ret;
}

static struct rc_map_table rc_map_cinergyt2_table[] = {
Expand Down Expand Up @@ -162,14 +162,16 @@ static int repeatable_keys[] = {
static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{
struct cinergyt2_state *st = d->priv;
int i;
int i, ret;

*state = REMOTE_NO_KEY_PRESSED;

mutex_lock(&st->data_mutex);
st->data[0] = CINERGYT2_EP1_GET_RC_EVENTS;

dvb_usb_generic_rw(d, st->data, 1, st->data, 5, 0);
ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 5, 0);
if (ret < 0)
goto ret;

if (st->data[4] == 0xff) {
/* key repeat */
Expand Down

0 comments on commit 54d577a

Please sign in to comment.