lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 100/376] media: dvb: return -EREMOTEIO on i2c transfer failure.
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit 96f3a9392799dd0f6472648a7366622ffd0989f3 ]

    Currently when i2c transfers fail the error return -EREMOTEIO
    is assigned to err but then later overwritten when the tuner
    attach call is made. Fix this by returning early with the
    error return code -EREMOTEIO on i2c transfer failure errors.

    If the transfer fails, an uninitialized value will be read from b2.

    Addresses-Coverity: ("Unused value")

    Fixes: fbfee8684ff2 ("V4L/DVB (5651): Dibusb-mb: convert pll handling to properly use dvb-pll")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Signed-off-by: Sean Young <sean@mess.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/dvb-usb/dibusb-mb.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
    index d4ea72bf09c5..5131c8d4c632 100644
    --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
    +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
    @@ -81,7 +81,7 @@ static int dibusb_tuner_probe_and_attach(struct dvb_usb_adapter *adap)

    if (i2c_transfer(&adap->dev->i2c_adap, msg, 2) != 2) {
    err("tuner i2c write failed.");
    - ret = -EREMOTEIO;
    + return -EREMOTEIO;
    }

    if (adap->fe_adap[0].fe->ops.i2c_gate_ctrl)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:24    [W:3.574 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site