Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 467e050e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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
parents 23469de6 31d86033

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -3006,6 +3006,14 @@ S: Supported 
F:	drivers/gpio/gpio-brcmstb.c

F:	Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt



BROADCOM BRCMSTB I2C DRIVER

M:	Kamal Dasu <kdasu.kdev@gmail.com>

L:	linux-i2c@vger.kernel.org

L:	bcm-kernel-feedback-list@broadcom.com

S:	Supported

F:	drivers/i2c/busses/i2c-brcmstb.c

F:	Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt



BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER

M:	Al Cooper <alcooperx@gmail.com>

L:	linux-kernel@vger.kernel.org

drivers/i2c/busses/i2c-rcar.c

+5 −1
Original line number Diff line number Diff line
@@ -806,8 +806,12 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, 


	time_left = wait_event_timeout(priv->wait, priv->flags & ID_DONE,

				     num * adap->timeout);

	if (!time_left) {



	/* cleanup DMA if it couldn't complete properly due to an error */

	if (priv->dma_direction != DMA_NONE)

		rcar_i2c_cleanup_dma(priv);



	if (!time_left) {

		rcar_i2c_init(priv);

		ret = -ETIMEDOUT;

	} else if (priv->flags & ID_NACK) {