Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b0ab25f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: qrtr: Fix early exit in del client and bye cmds"

parents 09ea6491 a51b58c8

net/qrtr/ns.c

+6 −8
Original line number Diff line number Diff line
@@ -388,10 +388,9 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) 
		msg.msg_namelen = sizeof(sq);



		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));

		if (ret < 0 && ret != -ENODEV) {

			pr_err("failed to send bye cmd %d\n", ret);

			return ret;

		}

		if (ret < 0 && ret != -ENODEV)

			pr_err("send bye failed: [0x%x:0x%x] 0x%x ret: %d\n",

			       srv->service, srv->instance, srv->port, ret);

	}



	return 0;
@@ -463,10 +462,9 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, 
		msg.msg_namelen = sizeof(sq);



		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));

		if (ret < 0 && ret != -ENODEV) {

			pr_err("failed to send del client cmd %d\n", ret);

			return ret;

		}

		if (ret < 0 && ret != -ENODEV)

			pr_err("del client cmd failed: [0x%x:0x%x] 0x%x %d\n",

			       srv->service, srv->instance, srv->port, ret);

	}



	return 0;