From cfa78b7b4f11ebee5d15b17bb2fb95eceb026331 Mon Sep 17 00:00:00 2001
From: Hans Christian Olaussen <41271048+klutvott123@users.noreply.github.com>
Date: Tue, 28 Dec 2021 20:09:58 +0100
Subject: [PATCH] Move telemetry displayport init and cms device registering

---
 src/main/fc/init.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/fc/init.c b/src/main/fc/init.c
index 2d4dec558..e4ab591cb 100644
--- a/src/main/fc/init.c
+++ b/src/main/fc/init.c
@@ -878,12 +878,6 @@ void init(void)
     cmsInit();
 #endif
 
-#ifdef USE_TELEMETRY
-    if (featureIsEnabled(FEATURE_TELEMETRY)) {
-        telemetryInit();
-    }
-#endif
-
 #if (defined(USE_OSD) || (defined(USE_MSP_DISPLAYPORT) && defined(USE_CMS)))
     displayPort_t *osdDisplayPort = NULL;
     osdDisplayPortDevice_e osdDisplayPortDevice = OSD_DISPLAYPORT_DEVICE_NONE;
@@ -969,6 +963,13 @@ void init(void)
     }
 #endif
 
+#ifdef USE_TELEMETRY
+    // Telemetry will initialise displayport and register with CMS by itself.
+    if (featureIsEnabled(FEATURE_TELEMETRY)) {
+        telemetryInit();
+    }
+#endif
+
     setArmingDisabled(ARMING_DISABLED_BOOT_GRACE_TIME);
 
     // On F4/F7 allocate SPI DMA streams before motor timers
-- 
2.11.4.GIT