From b9068aa333fa9555d070d16b58701c9f57dfe070 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Tue, 28 Jun 2022 22:05:59 -0400
Subject: [PATCH] Restore return statement that went missing. (#20087)

The changes in https://github.com/project-chip/connectedhomeip/pull/19870
incorrectly removed a return here.  Now we'll fall through to the cases that
assume the proxy is not in a connected state to start with, which is not
desirable.
---
 src/controller/CHIPDeviceController.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 258e49441041de..af7754600d4cf4 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -335,6 +335,7 @@ CHIP_ERROR DeviceController::DisconnectDevice(NodeId nodeId)
     if (proxy->IsConnected())
     {
         proxy->Disconnect();
+        return CHIP_NO_ERROR;
     }
 
     if (proxy->IsConnecting())