summaryrefslogtreecommitdiffstats
path: root/drivers/gnss
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2018-12-05 11:21:49 +0100
committerJohan Hovold <johan@kernel.org>2018-12-06 17:22:23 +0100
commit06fd9ab12b804451b14d538adbf98a57c2d6846b (patch)
tree47834839ee73b176855ea883e1b586aa61372fb2 /drivers/gnss
parent2595646791c319cadfdbf271563aac97d0843dc7 (diff)
downloadlinux-stable-06fd9ab12b804451b14d538adbf98a57c2d6846b.tar.gz
linux-stable-06fd9ab12b804451b14d538adbf98a57c2d6846b.tar.bz2
linux-stable-06fd9ab12b804451b14d538adbf98a57c2d6846b.zip
gnss: sirf: fix activation retry handling
Fix activation helper which would return -ETIMEDOUT even if the last retry attempt was successful. Also change the semantics of the retries variable so that it actually holds the number of retries (rather than tries). Fixes: d2efbbd18b1e ("gnss: add driver for sirfstar-based receivers") Cc: stable <stable@vger.kernel.org> # 4.19 Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/gnss')
-rw-r--r--drivers/gnss/sirf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gnss/sirf.c b/drivers/gnss/sirf.c
index 71d014edd167..2c22836d3ffd 100644
--- a/drivers/gnss/sirf.c
+++ b/drivers/gnss/sirf.c
@@ -168,7 +168,7 @@ static int sirf_set_active(struct sirf_data *data, bool active)
else
timeout = SIRF_HIBERNATE_TIMEOUT;
- while (retries-- > 0) {
+ do {
sirf_pulse_on_off(data);
ret = sirf_wait_for_power_state(data, active, timeout);
if (ret < 0) {
@@ -179,9 +179,9 @@ static int sirf_set_active(struct sirf_data *data, bool active)
}
break;
- }
+ } while (retries--);
- if (retries == 0)
+ if (retries < 0)
return -ETIMEDOUT;
return 0;