Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / media / usb / dvb-usb / digitv.c

diff --git a/drivers/media/usb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c
index 772bde3..4a81736 100644 (file)
--- a/drivers/media/usb/dvb-usb/digitv.c
+++ b/drivers/media/usb/dvb-usb/digitv.c
@@ -226,18 +226,22 @@ static struct rc_map_table rc_map_digitv_table[] = {
 
 static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-       int i;
+       int ret, i;
        u8 key[5];
        u8 b[4] = { 0 };
 
        *event = 0;
        *state = REMOTE_NO_KEY_PRESSED;
 
-       digitv_ctrl_msg(d,USB_READ_REMOTE,0,NULL,0,&key[1],4);
+       ret = digitv_ctrl_msg(d, USB_READ_REMOTE, 0, NULL, 0, &key[1], 4);
+       if (ret)
+               return ret;
 
        /* Tell the device we've read the remote. Not sure how necessary
           this is, but the Nebula SDK does it. */
-       digitv_ctrl_msg(d,USB_WRITE_REMOTE,0,b,4,NULL,0);
+       ret = digitv_ctrl_msg(d, USB_WRITE_REMOTE, 0, b, 4, NULL, 0);
+       if (ret)
+               return ret;
 
        /* if something is inside the buffer, simulate key press */
        if (key[1] != 0)