From 6dc841adbe2735e421471d773ddc5872fddf1897 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Wed, 12 Sep 2012 16:28:07 +0530 Subject: [PATCH] --- yaml --- r: 333387 b: refs/heads/master c: 3ff4443f888207359a561db60a9cb96aa136b8f3 h: refs/heads/master i: 333385: 6c4308f0e39f18759f7c4d0b29feb0e34bc2cb44 333383: e9c95ac4a4f38d2722307b51935ad1e2df9441e2 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1baaeeeccb33..7dcdc228e971 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 079d8af24b948261e1dae5d7df6b31b7bf205cb4 +refs/heads/master: 3ff4443f888207359a561db60a9cb96aa136b8f3 diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c index 3be147ab4eb9..7918e48c7fd3 100644 --- a/trunk/drivers/i2c/busses/i2c-omap.c +++ b/trunk/drivers/i2c/busses/i2c-omap.c @@ -1095,9 +1095,7 @@ omap_i2c_probe(struct platform_device *pdev) dev->fifo_size = (dev->fifo_size / 2); - if (dev->rev >= OMAP_I2C_REV_ON_3630_4430) - dev->b_hw = 0; /* Disable hardware fixes */ - else + if (dev->rev < OMAP_I2C_REV_ON_3630_4430) dev->b_hw = 1; /* Enable hardware fixes */ /* calculate wakeup latency constraint for MPU */