[PATCH 2/2] mgmtops: Move error message after command status handlers calls

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 4ce3ee4..ea1552d 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)
-- 
on behalf of ST-Ericsson

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux