diff options
| author | Allen Yu <alleny@nvidia.com> | 2014-05-20 00:33:36 +0800 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-05-28 02:55:44 -0700 |
| commit | fe5f71967d058d2cad583669d0ec9871f6f16078 (patch) | |
| tree | c28ade6e1720941beb645de81e121804cc86c035 /drivers/i2c | |
| parent | 755b2fb9e20857f7c55a5335f11ce6f90bfa87f6 (diff) | |
i2c-algo-bit: fix scheduling while atomic
i2c transfer using bit-banging may be in atomic context.
This patch avoid relinquishing processor during try_address()
in case of atomic context transfer.
Bug 200005734
Change-Id: I5ed18588acc9f7d46c840f218d194086ac09bb94
Signed-off-by: Allen Yu <alleny@nvidia.com>
Reviewed-on: http://git-master/r/411560
Reviewed-on: http://git-master/r/415023
Reviewed-by: Robert Shih <rshih@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Reviewed-by: Kerwin Wan <kerwinw@nvidia.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-bit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index fad22b0bb5b0..18768c80d87c 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c @@ -353,7 +353,8 @@ static int try_address(struct i2c_adapter *i2c_adap, bit_dbg(3, &i2c_adap->dev, "emitting stop condition\n"); i2c_stop(adap); udelay(adap->udelay); - yield(); + if (!i2c_adap->atomic_xfer_only) + cond_resched(); bit_dbg(3, &i2c_adap->dev, "emitting start condition\n"); i2c_start(adap); } |