diff options
author | Fabien Parent <fparent@baylibre.com> | 2019-10-18 13:32:13 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2019-10-24 14:52:11 -0400 |
commit | 62931ac2f9015ea38d80494ec37658ab3df6a6d7 (patch) | |
tree | b64a85da8d6439c5c388a039a3077d00589d3c87 | |
parent | 1f0d9cbeec9bb0a1c2013342836f2c9754d6502b (diff) |
i2c: mt65xx: fix NULL ptr dereference
Since commit abf4923e97c3 ("i2c: mediatek: disable zero-length transfers
for mt8183"), there is a NULL pointer dereference for all the SoCs
that don't have any quirk. mtk_i2c_functionality is not checking that
the quirks pointer is not NULL before starting to use it.
This commit add a call to i2c_check_quirks which will check whether
the quirks pointer is set, and if so will check if the IP has the
NO_ZERO_LEN quirk.
Fixes: abf4923e97c3 ("i2c: mediatek: disable zero-length transfers for mt8183")
Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-by: Cengiz Can <cengiz@kernel.wtf>
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Tested-by: Ulrich Hecht <uli@fpond.eu>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r-- | drivers/i2c/busses/i2c-mt65xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index 29eae1bf4f86..2152ec5f535c 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c | |||
@@ -875,7 +875,7 @@ static irqreturn_t mtk_i2c_irq(int irqno, void *dev_id) | |||
875 | 875 | ||
876 | static u32 mtk_i2c_functionality(struct i2c_adapter *adap) | 876 | static u32 mtk_i2c_functionality(struct i2c_adapter *adap) |
877 | { | 877 | { |
878 | if (adap->quirks->flags & I2C_AQ_NO_ZERO_LEN) | 878 | if (i2c_check_quirks(adap, I2C_AQ_NO_ZERO_LEN)) |
879 | return I2C_FUNC_I2C | | 879 | return I2C_FUNC_I2C | |
880 | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK); | 880 | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK); |
881 | else | 881 | else |