From a166ba77c4f001f54cf9f7b739003d280bc2f37f Mon Sep 17 00:00:00 2001
From: Michael Scott <mike@foundries.io>
Date: Mon, 27 Aug 2018 13:59:18 -0700
Subject: [PATCH] net: lwm2m: return observe errors immediately

Instead of continuing to do_read_op(), let's handle errors during
observe processing immediately.

Signed-off-by: Michael Scott <mike@foundries.io>
---
 subsys/net/lib/lwm2m/lwm2m_engine.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 3e6b9db3512..277e800047e 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -3329,9 +3329,12 @@ static int handle_request(struct coap_packet *request,
 							accept);
 				if (r < 0) {
 					SYS_LOG_ERR("add OBSERVE error: %d", r);
+					goto error;
 				}
 			} else {
 				SYS_LOG_ERR("OBSERVE request missing token");
+				r = -EINVAL;
+				goto error;
 			}
 		} else if (observe == 1) {
 			/* remove observer */