[PATCH] gnss: sirf: fix activation retry handling

[PATCH] gnss: sirf: fix activation retry handling

[Johan Hovold]

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>
---
 drivers/gnss/sirf.c | 6 +++---
 1 file 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;
-- 
2.19.2

Re: [PATCH] gnss: sirf: fix activation retry handling

[Andreas Kemnade]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

Hi,

On Wed,  5 Dec 2018 11:21:49 +0100
Johan Hovold <johan@kernel.org> wrote:

> 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).
> 
Sounds sane. I rebased my patch series on top of it and improved my
testing script (the manual on/off toggle in between was not working
properly)

Regards,
Andreas

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] gnss: sirf: fix activation retry handling

[Johan Hovold]

On Sun, Dec 09, 2018 at 08:58:02PM +0100, Andreas Kemnade wrote:
> Hi,
> 
> On Wed,  5 Dec 2018 11:21:49 +0100
> Johan Hovold <johan@kernel.org> wrote:
> 
> > 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).

> Sounds sane. I rebased my patch series on top of it and improved my
> testing script (the manual on/off toggle in between was not working
> properly)

That's great. And thanks for testing. I'm a bit short on time at the
moment, but will try to take at least a quick look at your v2 today.

Johan