lkml.org 
[lkml]   [2016]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/26] dibusb: 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/dibusb-common.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
    index 76b26dc7339c..36f958876383 100644
    --- a/drivers/media/usb/dvb-usb/dibusb-common.c
    +++ b/drivers/media/usb/dvb-usb/dibusb-common.c
    @@ -355,6 +355,7 @@ EXPORT_SYMBOL(rc_map_dibusb_table);
    int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
    {
    u8 *buf;
    + int ret;

    buf = kmalloc(5, GFP_KERNEL);
    if (!buf)
    @@ -362,7 +363,9 @@ int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)

    buf[0] = DIBUSB_REQ_POLL_REMOTE;

    - dvb_usb_generic_rw(d, buf, 1, buf, 5, 0);
    + ret = dvb_usb_generic_rw(d, buf, 1, buf, 5, 0);
    + if (ret < 0)
    + goto ret;

    dvb_usb_nec_rc_key_to_event(d, buf, event, state);

    @@ -371,6 +374,7 @@ int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)

    kfree(buf);

    - return 0;
    +ret:
    + return ret;
    }
    EXPORT_SYMBOL(dibusb_rc_query);
    --
    2.7.4

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