| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 6ff099b1ba8de74df9ddeb61e3825264b96ef692 Mon Sep 17 00:00:00 2001 |
| 2 | From: Moritz Fischer <moritz.fischer@ettus.com> |
| 3 | Date: Tue, 22 Dec 2015 19:38:31 -0800 |
| 4 | Subject: [PATCH] libgpsd-core: Fix issue with ACTIVATE hook not being called. |
| 5 | |
| 6 | In the current system session->mode seemed to ignore the |
| 7 | O_OPTIMIZE flag, leading to the ACTIVATE hook being ignored. |
| 8 | |
| 9 | Another way to fix this would be to keep the session->mode |
| 10 | condition pull up the check for O_CONTINUE. |
| 11 | |
| 12 | Upstream-Status: Backported |
| 13 | This patch is in upstream git |
| 14 | |
| 15 | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> |
| 16 | --- |
| 17 | libgpsd_core.c | 2 +- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/libgpsd_core.c b/libgpsd_core.c |
| 21 | index 31fec2a..a84e85f 100644 |
| 22 | --- a/libgpsd_core.c |
| 23 | +++ b/libgpsd_core.c |
| 24 | @@ -543,7 +543,7 @@ int gpsd_open(struct gps_device_t *session) |
| 25 | int gpsd_activate(struct gps_device_t *session, const int mode) |
| 26 | /* acquire a connection to the GPS device */ |
| 27 | { |
| 28 | - if (session->mode == O_OPTIMIZE) |
| 29 | + if (mode == O_OPTIMIZE) |
| 30 | gpsd_run_device_hook(&session->context->errout, |
| 31 | session->gpsdata.dev.path, "ACTIVATE"); |
| 32 | session->gpsdata.gps_fd = gpsd_open(session); |
| 33 | -- |
| 34 | 2.4.3 |
| 35 | |