diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 12:17:45 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 12:17:45 +0300 |
| commit | 9c96f401e91a4358eb4a5e227c1521dea1c20127 (patch) | |
| tree | e8a0b78324510ba6133c58cc05b2cb2f3876745e /drivers/gnss | |
| parent | 1528e40fd7d382e9668d3a1876a83d30bb04d554 (diff) | |
| parent | 40e020c129cfc991e8ab4736d2665351ffd1468d (diff) | |
| download | linux-9c96f401e91a4358eb4a5e227c1521dea1c20127.tar.xz | |
Merge 4.20-rc6 into tty-next
We want the TTY changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gnss')
| -rw-r--r-- | drivers/gnss/sirf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gnss/sirf.c b/drivers/gnss/sirf.c index b3a4c0e91947..226f6e6fe01b 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; |