Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbde117c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'gnss-4.20-rc6' of... 

Merge tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss

 into char-misc-linus

Johan writes:

GNSS fixes for 4.20-rc6

Here's a fix for a broken activation retry loop in the sirf driver.

Included are also two MAINTAINERS updates.

All have been in linux-next with no reported issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss:
  MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching
  MAINTAINERS: add gnss scm tree
  gnss: sirf: fix activation retry handling
parents 37c2578c 63cea1f7

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1472,6 +1472,7 @@ F: drivers/clk/sirf/ 
F:	drivers/clocksource/timer-prima2.c

F:	drivers/clocksource/timer-atlas7.c

N:	[^a-z]sirf

X:	drivers/gnss



ARM/EBSA110 MACHINE SUPPORT

M:	Russell King <linux@armlinux.org.uk>
@@ -6316,6 +6317,7 @@ F: include/uapi/linux/gigaset_dev.h 


GNSS SUBSYSTEM

M:	Johan Hovold <johan@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git

S:	Maintained

F:	Documentation/ABI/testing/sysfs-class-gnss

F:	Documentation/devicetree/bindings/gnss/

drivers/gnss/sirf.c

+3 −3
Original line number Diff line number Diff line
@@ -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;