summaryrefslogtreecommitdiff
path: root/serial.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2006-10-30 16:25:47 +0000
committerEric S. Raymond <esr@thyrsus.com>2006-10-30 16:25:47 +0000
commita6029c84bac42ca8d0e77648b8af8025764eae26 (patch)
treedc190f92804bceafa0cd7fe01fa27b7afba9ce76 /serial.c
parent4e59d3f0957dc18af087084decbd9ff70af67644 (diff)
downloadgpsd-a6029c84bac42ca8d0e77648b8af8025764eae26.tar.gz
Make it possible to disable reconfiguration.
Diffstat (limited to 'serial.c')
-rw-r--r--serial.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/serial.c b/serial.c
index fb65ff34..2890452e 100644
--- a/serial.c
+++ b/serial.c
@@ -206,10 +206,11 @@ int gpsd_open(struct gps_device_t *session)
if ((*dp)->probe_detect!=NULL && (*dp)->probe_detect(session)!=0) {
gpsd_report(3, "probe found %s driver...\n", (*dp)->typename);
/*@i1@*/session->device_type = *dp;
- if (session->device_type->probe_subtype)
+ if (session->device_type->probe_subtype !=NULL)
session->device_type->probe_subtype(session);
#ifdef ALLOW_RECONFIGURE
- if (session->device_type->configurator)
+ if (session->context->enable_reconfigure
+ && session->device_type->configurator != NULL)
session->device_type->configurator(session);
#endif /* ALLOW_RECONFIGURE */
/*@i1@*/return session->gpsdata.gps_fd;