2 files changed, 13 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7f371d372bdd..7ad424b7b8df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 52cf42b32f0a..4aa7dde876f3 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -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) {