Merge "net: qrtr: Allocate workqueue before kernel_bind" (10cbadfc) · Commits · e / devices / android_kernel_fairphone_FP5

net/qrtr/ns.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -717,6 +717,10 @@ void qrtr_ns_init(void)
	goto err_sock;		goto err_sock;
	}		}

			qrtr_ns.workqueue = alloc_workqueue("qrtr_ns_handler", WQ_UNBOUND, 1);
			if (!qrtr_ns.workqueue)
			goto err_sock;

	qrtr_ns.sock->sk->sk_data_ready = qrtr_ns_data_ready;		qrtr_ns.sock->sk->sk_data_ready = qrtr_ns_data_ready;

	sq.sq_port = QRTR_PORT_CTRL;		sq.sq_port = QRTR_PORT_CTRL;
	@@ -725,17 +729,13 @@ void qrtr_ns_init(void)
	ret = kernel_bind(qrtr_ns.sock, (struct sockaddr *)&sq, sizeof(sq));		ret = kernel_bind(qrtr_ns.sock, (struct sockaddr *)&sq, sizeof(sq));
	if (ret < 0) {		if (ret < 0) {
	pr_err("failed to bind to socket\n");		pr_err("failed to bind to socket\n");
	goto err_sock;		goto err_wq;
	}		}

	qrtr_ns.bcast_sq.sq_family = AF_QIPCRTR;		qrtr_ns.bcast_sq.sq_family = AF_QIPCRTR;
	qrtr_ns.bcast_sq.sq_node = QRTR_NODE_BCAST;		qrtr_ns.bcast_sq.sq_node = QRTR_NODE_BCAST;
	qrtr_ns.bcast_sq.sq_port = QRTR_PORT_CTRL;		qrtr_ns.bcast_sq.sq_port = QRTR_PORT_CTRL;

	qrtr_ns.workqueue = alloc_workqueue("qrtr_ns_handler", WQ_UNBOUND, 1);
	if (!qrtr_ns.workqueue)
	goto err_sock;

	ret = say_hello(&qrtr_ns.bcast_sq);		ret = say_hello(&qrtr_ns.bcast_sq);
	if (ret < 0)		if (ret < 0)
	goto err_wq;		goto err_wq;