lkml.org 
[lkml]   [2016]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 03/31] cinergyT2-core: handle error code on RC query
    Date
    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 | 8 +++++---
    1 file 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 d85c0c4d4042..2520e30f5338 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)
    + return ret;

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

    \
     
     \ /
      Last update: 2016-10-11 12:19    [W:2.749 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site