diff options
| author | Shardar Shariff Md <smohammed@nvidia.com> | 2016-08-31 18:58:43 +0530 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2016-09-08 22:34:23 +0200 |
| commit | 2bc445e2253f963412083c3eb1fc92a276086389 (patch) | |
| tree | b8418e7a9b779a4adfceae3d1b500df1af79c626 /drivers/i2c | |
| parent | 89120d66fce9b6df4b9300fab373676648994cb8 (diff) | |
| download | linux-2bc445e2253f963412083c3eb1fc92a276086389.tar.bz2 | |
i2c: tegra: use atomic poll function during configuration
Use readl_poll_timeout_atomic() function as *wait_for_config_load()
function can be called from interrupt context.
Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index daab0cea20b4..243753564110 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -457,8 +457,13 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev) reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD); addr = i2c_dev->base + reg_offset; i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD); - err = readl_poll_timeout(addr, val, val == 0, 1000, - I2C_CONFIG_LOAD_TIMEOUT); + if (in_interrupt()) + err = readl_poll_timeout_atomic(addr, val, val == 0, + 1000, I2C_CONFIG_LOAD_TIMEOUT); + else + err = readl_poll_timeout(addr, val, val == 0, + 1000, I2C_CONFIG_LOAD_TIMEOUT); + if (err) { dev_warn(i2c_dev->dev, "timeout waiting for config load\n"); |