Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Wolfram writes:
"i2c for 4.19
Another driver bugfix and MAINTAINERS addition from I2C."
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: rcar: cleanup DMA for all kinds of failure
MAINTAINERS: Add entry for Broadcom STB I2C controller
+13
-1
+8
MAINTAINERS
+8
MAINTAINERS
···
3006
3006
F: drivers/gpio/gpio-brcmstb.c
3007
3007
F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
3008
3008
3009
+
BROADCOM BRCMSTB I2C DRIVER
3010
+
M: Kamal Dasu <kdasu.kdev@gmail.com>
3011
+
L: linux-i2c@vger.kernel.org
3012
+
L: bcm-kernel-feedback-list@broadcom.com
3013
+
S: Supported
3014
+
F: drivers/i2c/busses/i2c-brcmstb.c
3015
+
F: Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
3016
+
3009
3017
BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
3010
3018
M: Al Cooper <alcooperx@gmail.com>
3011
3019
L: linux-kernel@vger.kernel.org
+5
-1
drivers/i2c/busses/i2c-rcar.c
+5
-1
drivers/i2c/busses/i2c-rcar.c
···
806
806
807
807
time_left = wait_event_timeout(priv->wait, priv->flags & ID_DONE,
808
808
num * adap->timeout);
809
-
if (!time_left) {
809
+
810
+
/* cleanup DMA if it couldn't complete properly due to an error */
811
+
if (priv->dma_direction != DMA_NONE)
810
812
rcar_i2c_cleanup_dma(priv);
813
+
814
+
if (!time_left) {
811
815
rcar_i2c_init(priv);
812
816
ret = -ETIMEDOUT;
813
817
} else if (priv->flags & ID_NACK) {