From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx> err is only used to assign -errno before return. --- tools/l2cap-tester.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c index e4dade2..4b1e5e2 100644 --- a/tools/l2cap-tester.c +++ b/tools/l2cap-tester.c @@ -489,15 +489,14 @@ static int create_l2cap_sock(struct test_data *data, uint16_t psm) { const uint8_t *master_bdaddr; struct sockaddr_l2 addr; - int sk, err; + int sk; sk = socket(PF_BLUETOOTH, SOCK_SEQPACKET | SOCK_NONBLOCK, BTPROTO_L2CAP); if (sk < 0) { - err = -errno; tester_warn("Can't create socket: %s (%d)", strerror(errno), errno); - return err; + return -errno; } master_bdaddr = hciemu_get_master_bdaddr(data->hciemu); @@ -517,11 +516,10 @@ static int create_l2cap_sock(struct test_data *data, uint16_t psm) addr.l2_bdaddr_type = BDADDR_BREDR; if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - err = -errno; tester_warn("Can't bind socket: %s (%d)", strerror(errno), errno); close(sk); - return err; + return -errno; } return sk; -- 1.8.3.2 -- 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