From 00372cde4dc5b311e7142d0f43e8f343ce1dc210 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 13 Jun 2012 16:03:53 +0200 Subject: [PATCH] mgmtops: Move error message after command status handlers calls Don't print error message for actions that are expected or recoverable i.e. add_uuid returning EBUSY status. --- plugins/mgmtops.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c index 4ce3ee4e4..ea1552d39 100644 --- a/plugins/mgmtops.c +++ b/plugins/mgmtops.c @@ -1470,19 +1470,21 @@ static void mgmt_cmd_status(int sk, uint16_t index, void *buf, size_t len) return; } - error("hci%u: %s (0x%04x) failed: %s (0x%02x)", index, - mgmt_opstr(opcode), opcode, mgmt_errstr(ev->status), - ev->status); - switch (opcode) { case MGMT_OP_READ_LOCAL_OOB_DATA: read_local_oob_data_failed(sk, index); break; case MGMT_OP_ADD_UUID: - if (ev->status == MGMT_STATUS_BUSY) + if (ev->status == MGMT_STATUS_BUSY) { mgmt_add_uuid_busy(sk, index); + return; + } break; } + + error("hci%u: %s (0x%04x) failed: %s (0x%02x)", index, + mgmt_opstr(opcode), opcode, mgmt_errstr(ev->status), + ev->status); } static void mgmt_controller_error(int sk, uint16_t index, void *buf, size_t len) -- 2.47.3