lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 559/775] i2c: brcmstb: Fix brcmstd_send_i2c_cmd condition
    Date
    From: Maxime Ripard <maxime@cerno.tech>

    [ Upstream commit a1858ce0cfe31368b23ba55794e409fb57ced4a4 ]

    The brcmstb_send_i2c_cmd currently has a condition that is (CMD_RD ||
    CMD_WR) which always evaluates to true, while the obvious fix is to test
    whether the cmd variable passed as parameter holds one of these two
    values.

    Fixes: dd1aa2524bc5 ("i2c: brcmstb: Add Broadcom settop SoC i2c controller driver")
    Reported-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    Acked-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/busses/i2c-brcmstb.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
    index d4e0a0f6732ae..ba766d24219ef 100644
    --- a/drivers/i2c/busses/i2c-brcmstb.c
    +++ b/drivers/i2c/busses/i2c-brcmstb.c
    @@ -316,7 +316,7 @@ static int brcmstb_send_i2c_cmd(struct brcmstb_i2c_dev *dev,
    goto cmd_out;
    }

    - if ((CMD_RD || CMD_WR) &&
    + if ((cmd == CMD_RD || cmd == CMD_WR) &&
    bsc_readl(dev, iic_enable) & BSC_IIC_EN_NOACK_MASK) {
    rc = -EREMOTEIO;
    dev_dbg(dev->device, "controller received NOACK intr for %s\n",
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 14:40    [W:2.144 / U:0.932 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site