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

Commit 8d2bd428 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Don't write to glink channel while closing channel"

parents 26aeafbe fd9b84ef

drivers/char/diag/diagfwd_rpmsg.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -499,7 +499,6 @@ static void diag_rpmsg_close_work_fn(struct work_struct *work) 
							close_work);

							close_work);

	if (!rpmsg_info || !rpmsg_info->inited || !rpmsg_info->hdl)

	if (!rpmsg_info || !rpmsg_info->inited || !rpmsg_info->hdl)

		return;

		return;

	atomic_set(&rpmsg_info->opened, 0);

	rpmsg_info->hdl = NULL;

	rpmsg_info->hdl = NULL;

	diagfwd_channel_close(rpmsg_info->fwd_ctxt);

	diagfwd_channel_close(rpmsg_info->fwd_ctxt);

}

}
@@ -770,9 +769,11 @@ static void diag_rpmsg_remove(struct rpmsg_device *rpdev) 
		return;

		return;





	rpmsg_info = diag_get_rpmsg_ptr(rpdev->id.name);

	rpmsg_info = diag_get_rpmsg_ptr(rpdev->id.name);

	if (rpmsg_info)

	if (rpmsg_info) {

		atomic_set(&rpmsg_info->opened, 0);

		queue_work(rpmsg_info->wq, &rpmsg_info->close_work);

		queue_work(rpmsg_info->wq, &rpmsg_info->close_work);

	}

	}

}





static struct rpmsg_device_id rpmsg_diag_table[] = {

static struct rpmsg_device_id rpmsg_diag_table[] = {

	{ .name	= "DIAG_CMD" },

	{ .name	= "DIAG_CMD" },