lkml.org 
[lkml]   [2011]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7 v2] i2c-eg20t: Fix bus-idle waiting issue
    Date
    Currently, when checking whether bus is idle or not,
    if timeout occurs,
    this function always returns success(zero).
    This patch fixes the issue.

    Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
    ---
    v2: "[PATCH] i2c-eg20t: Fix bus-idle waiting issue" was invalid patch.
    ---
    drivers/i2c/busses/i2c-eg20t.c | 20 ++++++++++----------
    1 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
    index cf64e21..2f961b3 100644
    --- a/drivers/i2c/busses/i2c-eg20t.c
    +++ b/drivers/i2c/busses/i2c-eg20t.c
    @@ -273,24 +273,24 @@ static s32 pch_i2c_wait_for_bus_idle(struct i2c_algo_pch_data *adap,
    s32 timeout)
    {
    void __iomem *p = adap->pch_base_address;
    + ktime_t ns_val;
    +
    + if ((ioread32(p + PCH_I2CSR) & I2CMBB_BIT) == 0)
    + return 0;

    /* MAX timeout value is timeout*1000*1000nsec */
    - ktime_t ns_val = ktime_add_ns(ktime_get(), timeout*1000*1000);
    + ns_val = ktime_add_ns(ktime_get(), timeout*1000*1000);
    do {
    - if ((ioread32(p + PCH_I2CSR) & I2CMBB_BIT) == 0)
    - break;
    msleep(20);
    + if ((ioread32(p + PCH_I2CSR) & I2CMBB_BIT) == 0)
    + return 0;
    } while (ktime_lt(ktime_get(), ns_val));

    pch_dbg(adap, "I2CSR = %x\n", ioread32(p + PCH_I2CSR));
    + pch_err(adap, "%s: Timeout Error.return%d\n", __func__, -ETIME);
    + pch_i2c_init(adap);

    - if (timeout == 0) {
    - pch_err(adap, "%s: Timeout Error.return%d\n", __func__, -ETIME);
    - pch_i2c_init(adap);
    - return -ETIME;
    - }
    -
    - return 0;
    + return -ETIME;
    }

    /**
    --
    1.7.6.4


    \
     
     \ /
      Last update: 2011-10-05 06:21    [W:0.021 / U:61.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site