]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
[media] cinergyT2-core: handle error code on RC query
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 7 Oct 2016 16:54:33 +0000 (13:54 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 14 Oct 2016 15:35:51 +0000 (12:35 -0300)
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>
drivers/media/usb/dvb-usb/cinergyT2-core.c

index d85c0c4d40421c59b7779e7982a6ca5fe9d81f81..8ac825413d5ac09a17f33f9a6537e0cd69e4564c 100644 (file)
@@ -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 */