Home| summaryrefslogtreecommitdiff |
diff options
| author | Coly Li <colyli@suse.de> | 2018-07-09 18:43:31 +0800 |
|---|---|---|
| committer | Coly Li <colyli@suse.de> | 2018-07-09 18:47:09 +0800 |
| commit | fb4b3cb6a2acee1052991bdc155e1eb02142cdee (patch) | |
| tree | 4e20a68982baf43533374316ca9f62b5f2932c31 | |
| parent | b2ce9a5ac15b78753764bd29ba10938386ebfa2c (diff) | |
media: smiapp: fix timeout checking in smiapp_read_nvm
(bsc#1099918).
suse-commit: 4c47ad88fc338ae238c9000807159feb53a210a1
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index fb39dfd55e75..46a052c5be2e 100644 --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c @@ -981,7 +981,7 @@ static int smiapp_read_nvm(struct smiapp_sensor *sensor, if (rval) goto out; - for (i = 0; i < 1000; i++) { + for (i = 1000; i > 0; i--) { rval = smiapp_read( sensor, SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS, &s); @@ -992,11 +992,10 @@ static int smiapp_read_nvm(struct smiapp_sensor *sensor, if (s & SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY) break; - if (--i == 0) { - rval = -ETIMEDOUT; - goto out; - } - + } + if (!i) { + rval = -ETIMEDOUT; + goto out; } for (i = 0; i < SMIAPP_NVM_PAGE_SIZE; i++) { |