| Message ID | 20200426081211.10876-1-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RFT] i2c: brcmstb: properly check NACK condition | expand |
On Sun, Apr 26, 2020 at 4:12 AM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > From: Wolfram Sang <wsa@the-dreams.de> > > cppcheck rightfully complains about: > > drivers/i2c/busses/i2c-brcmstb.c:319:7: warning: Condition 'CMD_RD' is always true [knownConditionTrueFalse] > drivers/i2c/busses/i2c-brcmstb.c:319:17: warning: Condition 'CMD_WR' is always false [knownConditionTrueFalse] > if ((CMD_RD || CMD_WR) && > > Compare the values to the 'cmd' variable. > > Fixes: dd1aa2524bc5 ("i2c: brcmstb: Add Broadcom settop SoC i2c controller driver") > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Reviewed-by: Kamal Dasu <kdasu.kdev@gmail.com> --- > > Not tested on HW. > > 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 d4e0a0f6732a..ba766d24219e 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.20.1 >
On 4/26/2020 1:12 AM, Wolfram Sang wrote: > From: Wolfram Sang <wsa@the-dreams.de> > > cppcheck rightfully complains about: > > drivers/i2c/busses/i2c-brcmstb.c:319:7: warning: Condition 'CMD_RD' is always true [knownConditionTrueFalse] > drivers/i2c/busses/i2c-brcmstb.c:319:17: warning: Condition 'CMD_WR' is always false [knownConditionTrueFalse] > if ((CMD_RD || CMD_WR) && > > Compare the values to the 'cmd' variable. > > Fixes: dd1aa2524bc5 ("i2c: brcmstb: Add Broadcom settop SoC i2c controller driver") > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
On Sun, Apr 26, 2020 at 10:12:10AM +0200, Wolfram Sang wrote: > From: Wolfram Sang <wsa@the-dreams.de> > > cppcheck rightfully complains about: > > drivers/i2c/busses/i2c-brcmstb.c:319:7: warning: Condition 'CMD_RD' is always true [knownConditionTrueFalse] > drivers/i2c/busses/i2c-brcmstb.c:319:17: warning: Condition 'CMD_WR' is always false [knownConditionTrueFalse] > if ((CMD_RD || CMD_WR) && > > Compare the values to the 'cmd' variable. > > Fixes: dd1aa2524bc5 ("i2c: brcmstb: Add Broadcom settop SoC i2c controller driver") > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Applied to for-current, thanks!
diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c index d4e0a0f6732a..ba766d24219e 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",