diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-07 13:54:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-14 12:35:51 -0300 |
| commit | 54d577a4c91ba5dfe634ddee26223bc9a39687a7 (patch) | |
| tree | 724671fdf5506ec64775c1e906a2ede37f4e6c0e /drivers/media | |
| parent | 5ef8ed0e5608f75805e41ef8abbe94a3597e6613 (diff) | |
| download | op-kernel-dev-54d577a4c91ba5dfe634ddee26223bc9a39687a7.zip op-kernel-dev-54d577a4c91ba5dfe634ddee26223bc9a39687a7.tar.gz | |
[media] cinergyT2-core: handle error code on RC query
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/usb/dvb-usb/cinergyT2-core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c index d85c0c4..8ac8254 100644 --- a/drivers/media/usb/dvb-usb/cinergyT2-core.c +++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c @@ -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[] = { @@ -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 */ |
