From fc88a5ec6f6723c3b5e3d52ec08b19c11273cc49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Mon, 3 May 2021 11:52:51 -0400 Subject: [PATCH] Build fix: kernel-consumerd: merge conflict left in file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau Change-Id: I71defaee6724a08661567af879b91a57d9dae74c --- src/common/kernel-consumer/kernel-consumer.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c index 8c0a87737..5334d1358 100644 --- a/src/common/kernel-consumer/kernel-consumer.c +++ b/src/common/kernel-consumer/kernel-consumer.c @@ -1604,17 +1604,10 @@ enum get_next_subbuffer_status get_subbuffer_common( * when there is no data for a finalized stream. Those can be * combined into a -ENODATA return value. */ -<<<<<<< HEAD - if (ret == -EAGAIN) { - ret = -ENODATA; - } - -======= status = GET_NEXT_SUBBUFFER_STATUS_NO_DATA; goto end; default: status = GET_NEXT_SUBBUFFER_STATUS_ERROR; ->>>>>>> ba6c36321 (Clean-up: consumerd: use a specific status code for get_next_subbuffer) goto end; } -- 2.34.1