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

Commit 44d000ef authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: glink: Move channel to dummy xprt with lock" into msm-4.9

parents e073bdc0 52fdd413

drivers/soc/qcom/glink.c

+1 −2
Original line number Diff line number Diff line
@@ -4188,7 +4188,6 @@ static void glink_core_channel_cleanup(struct glink_core_xprt_ctx *xprt_ptr) 
		if (ctx->local_open_state == GLINK_CHANNEL_OPENED ||

			ctx->local_open_state == GLINK_CHANNEL_OPENING) {

			ctx->transport_ptr = dummy_xprt_ctx;

			rwref_write_put(&ctx->ch_state_lhb2);

			glink_core_move_ch_node(xprt_ptr, dummy_xprt_ctx, ctx);

		} else {

			/* local state is in either CLOSED or CLOSING */
@@ -4198,9 +4197,9 @@ static void glink_core_channel_cleanup(struct glink_core_xprt_ctx *xprt_ptr) 
			/* Channel should be fully closed now. Delete here */

			if (ch_is_fully_closed(ctx))

				glink_delete_ch_from_list(ctx, false);

			rwref_write_put(&ctx->ch_state_lhb2);

		}

		rwref_put(&ctx->ch_state_lhb2);

		rwref_write_put(&ctx->ch_state_lhb2);

		ctx = get_first_ch_ctx(xprt_ptr);

	}

	spin_lock_irqsave(&xprt_ptr->xprt_ctx_lock_lhb1, flags);