Merge "diag: In diag_socket_read continue reads when ctrl port pkt arrives" into msm-4.14 (62ed1025) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/char/diag/diagfwd_socket.c

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -683,12 +683,8 @@ static int diag_socket_read(void ctxt, unsigned char buf, int buf_len)
	} else if (read_len <= 0)		} else if (read_len <= 0)
	goto fail;		goto fail;

	if (src_addr.sq_port == QRTR_PORT_CTRL) {		if (src_addr.sq_port == QRTR_PORT_CTRL)
	mutex_lock(channel_mutex);		continue;
	diagfwd_channel_read_done(info->fwd_ctxt, buf, 0);
	mutex_unlock(channel_mutex);
	return 0;
	}

	if (!atomic_read(&info->opened) &&		if (!atomic_read(&info->opened) &&
	info->port_type == PORT_TYPE_SERVER) {		info->port_type == PORT_TYPE_SERVER) {