drivers/at_cmd: Correct detection of CME / CMS errors

Reorder presedence of error detection and correct
pattern to match.

Signed-off-by: Glenn Ruben Bakke <[email protected]>

Author: gbakke

drivers/at_cmd/at_cmd.c

@@ -19,8 +19,8 @@ LOG_MODULE_REGISTER(at_cmd, CONFIG_AT_CMD_LOG_LEVEL);
 
 #define AT_CMD_OK_STR    "OK"
 #define AT_CMD_ERROR_STR "ERROR"
-#define AT_CMD_CMS_STR   "+CMS:"
-#define AT_CMD_CME_STR   "+CME:"
+#define AT_CMD_CMS_STR   "+CMS ERROR:"
+#define AT_CMD_CME_STR   "+CME ERROR:"
 
 static K_THREAD_STACK_DEFINE(socket_thread_stack, \
 				CONFIG_AT_CMD_THREAD_STACK_SIZE);
@@ -77,13 +77,6 @@ static int get_return_code(char *buf, struct return_state_object *ret)
 			break;
 		}
 
-		tmpstr = strstr(buf, AT_CMD_ERROR_STR);
-		if (tmpstr) {
-			ret->state = AT_CMD_ERROR;
-			ret->code  = -ENOEXEC;
-			break;
-		}
-
 		tmpstr = strstr(buf, AT_CMD_CMS_STR);
 		if (tmpstr) {
 			ret->state = AT_CMD_ERROR_CMS;
@@ -97,6 +90,13 @@ static int get_return_code(char *buf, struct return_state_object *ret)
 			ret->code = atoi(&buf[ARRAY_SIZE(AT_CMD_CMS_STR) - 1]);
 			break;
 		}
+
+		tmpstr = strstr(buf, AT_CMD_ERROR_STR);
+		if (tmpstr) {
+			ret->state = AT_CMD_ERROR;
+			ret->code  = -ENOEXEC;
+			break;
+		}
 	} while (0);
 
 	if (tmpstr) {