From 159cb5449baf63c89cb4896c9d16d05a6bd53bb5 Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Sat, 15 Sep 2018 10:59:56 +0900
Subject: [PATCH] Avoid inactive telemetry port from being registered as a
 displayport device

---
 src/main/telemetry/crsf.c | 4 ++++
 src/main/telemetry/hott.c | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/telemetry/crsf.c b/src/main/telemetry/crsf.c
index 12b7263c7..47b449d36 100644
--- a/src/main/telemetry/crsf.c
+++ b/src/main/telemetry/crsf.c
@@ -432,6 +432,10 @@ void initCrsfTelemetry(void)
     // and feature is enabled, if so, set CRSF telemetry enabled
     crsfTelemetryEnabled = crsfRxIsActive();
 
+    if (!crsfTelemetryEnabled) {
+        return;
+    }
+
     deviceInfoReplyPending = false;
 #if defined(USE_MSP_OVER_TELEMETRY)
     mspReplyPending = false;
diff --git a/src/main/telemetry/hott.c b/src/main/telemetry/hott.c
index b6bd2092c..01ce3b2d4 100644
--- a/src/main/telemetry/hott.c
+++ b/src/main/telemetry/hott.c
@@ -347,6 +347,11 @@ void freeHoTTTelemetryPort(void)
 void initHoTTTelemetry(void)
 {
     portConfig = findSerialPortConfig(FUNCTION_TELEMETRY_HOTT);
+
+    if (!portConfig) {
+        return;
+    }
+
     hottPortSharing = determinePortSharing(portConfig, FUNCTION_TELEMETRY_HOTT);
 
 #if defined (USE_HOTT_TEXTMODE) && defined (USE_CMS)