From 8be59c73c7cab1d4f6c2b3dd5d45021cfa239f29 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Thu, 18 Jan 2018 09:02:42 +1100
Subject: [PATCH] AP_RCProtocol: fixed return value when no input

---
 libraries/AP_RCProtocol/AP_RCProtocol.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/AP_RCProtocol/AP_RCProtocol.cpp b/libraries/AP_RCProtocol/AP_RCProtocol.cpp
index b095180aff..3918300fa7 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol.cpp
+++ b/libraries/AP_RCProtocol/AP_RCProtocol.cpp
@@ -51,16 +51,14 @@ uint8_t AP_RCProtocol::num_channels()
 {
     if (_detected_protocol != AP_RCProtocol::NONE) {
         return backend[_detected_protocol]->num_channels();
-    } else {
-        return AP_RCProtocol::NONE;
     }
+    return 0;
 }
 
 uint16_t AP_RCProtocol::read(uint8_t chan)
 {
     if (_detected_protocol != AP_RCProtocol::NONE) {
         return backend[_detected_protocol]->read(chan);
-    } else {
-        return 0;
     }
+    return 0;
 }