mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-16 07:35:14 +00:00
drm/exynos: fix missing decrement of retry counter
[ Upstream commit1bbbab097a
] Currently the retry counter is not being decremented, leading to a potential infinite spin if the scalar_reads don't change state. Addresses-Coverity: ("Infinite loop") Fixes:280e54c9f6
("drm/exynos: scaler: Reset hardware before starting the operation") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c256729f26
commit
cf9a18d7bc
1 changed files with 2 additions and 2 deletions
|
@ -108,12 +108,12 @@ static inline int scaler_reset(struct scaler_context *scaler)
|
||||||
scaler_write(SCALER_CFG_SOFT_RESET, SCALER_CFG);
|
scaler_write(SCALER_CFG_SOFT_RESET, SCALER_CFG);
|
||||||
do {
|
do {
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
} while (retry > 1 &&
|
} while (--retry > 1 &&
|
||||||
scaler_read(SCALER_CFG) & SCALER_CFG_SOFT_RESET);
|
scaler_read(SCALER_CFG) & SCALER_CFG_SOFT_RESET);
|
||||||
do {
|
do {
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
scaler_write(1, SCALER_INT_EN);
|
scaler_write(1, SCALER_INT_EN);
|
||||||
} while (retry > 0 && scaler_read(SCALER_INT_EN) != 1);
|
} while (--retry > 0 && scaler_read(SCALER_INT_EN) != 1);
|
||||||
|
|
||||||
return retry ? 0 : -EIO;
|
return retry ? 0 : -EIO;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue