1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index ef73483efb84..00fd02ec1b65 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -763,17 +763,25 @@ omap_i2c_rev1_isr(int this_irq, void *dev_id)
  */
 static int errata_omap3_1p153(struct omap_i2c_dev *dev, u16 *stat, int *err)
 {
-        while (!(*stat & OMAP_I2C_STAT_XUDF)) {
+        unsigned long timeout = 10000;
+
+        while (--timeout && !(*stat & OMAP_I2C_STAT_XUDF)) {
                 if (*stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) {
                         omap_i2c_ack_stat(dev, *stat & (OMAP_I2C_STAT_XRDY |
                                                         OMAP_I2C_STAT_XDR));
                         *err |= OMAP_I2C_STAT_XUDF;
                         return -ETIMEDOUT;
                 }
+
                 cpu_relax();
                 *stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
         }
 
+        if (!timeout) {
+                dev_err(dev->dev, "timeout waiting on XUDF bit\n");
+                return 0;
+        }
+
         return 0;
 }