diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-03 13:51:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-03 13:51:37 -0800 |
| commit | c2bf05db6c78f53ca5cd4b48f3b9b71f78d215f1 (patch) | |
| tree | c22612c69faf8a733677500044f7bf5906d47ed0 /drivers/i2c/busses/i2c-qcom-geni.c | |
| parent | 6085bc95797caa55a68bc0f7dd73e8c33e91037f (diff) | |
| parent | d36678f7905cbd1dc55a8a96e066dafd749d4600 (diff) | |
| download | linux-c2bf05db6c78f53ca5cd4b48f3b9b71f78d215f1.tar.gz | |
Merge tag 'i2c-for-6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"A power state fix in the core for ACPI devices, a regression fix
regarding bus recovery for the cadence driver, a DMA handling fix for
the imx driver, and two error path fixes (npcm7xx and qcom-geni)"
* tag 'i2c-for-6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: imx: Only DMA messages with I2C_M_DMA_SAFE flag set
i2c: qcom-geni: fix error return code in geni_i2c_gpi_xfer
i2c: cadence: Fix regression with bus recovery
i2c: Restore initial power state if probe fails
i2c: npcm7xx: Fix error handling in npcm_i2c_init()
Diffstat (limited to 'drivers/i2c/busses/i2c-qcom-geni.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-qcom-geni.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index 84a77512614d..8fce98bb77ff 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -626,7 +626,6 @@ static int geni_i2c_gpi_xfer(struct geni_i2c_dev *gi2c, struct i2c_msg msgs[], i dev_err(gi2c->se.dev, "I2C timeout gpi flags:%d addr:0x%x\n", gi2c->cur->flags, gi2c->cur->addr); gi2c->err = -ETIMEDOUT; - goto err; } if (gi2c->err) { |