From 10e8e8e9cc05c93cc6eb6a10be70d89e5d18b369 Mon Sep 17 00:00:00 2001
From: Siddharth Purohit <siddharthbharatpurohit@gmail.com>
Date: Tue, 30 Jul 2019 13:54:16 +0800
Subject: [PATCH] AP_BoardConfig_CAN: fix bad get_slcan_serial method

---
 libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp b/libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp
index 16e13a6e3f..ce66a7fde3 100644
--- a/libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp
+++ b/libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp
@@ -193,8 +193,11 @@ AP_HAL::UARTDriver *AP_BoardConfig_CAN::get_slcan_serial()
     if (_slcan._ser_port != -1) {
         return AP::serialmanager().get_serial_by_id(_slcan._ser_port);
     }
-    if (AP::serialmanager().find_serial(AP_SerialManager::SerialProtocol_SLCAN, 0)->is_initialized()) {
-        return AP::serialmanager().find_serial(AP_SerialManager::SerialProtocol_SLCAN, 0);
+    AP_HAL::UARTDriver *ser_port = AP::serialmanager().find_serial(AP_SerialManager::SerialProtocol_SLCAN, 0);
+    if (ser_port != nullptr) {
+        if (ser_port->is_initialized()) {
+            return ser_port;
+        }
     }
     return nullptr;
 }