diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-19 16:42:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-19 16:42:04 -0700 |
| commit | 3e0ab6ba33de93cdf7e519d030c01e53a199f09c (patch) | |
| tree | 8c61891003a84c65a0a16ee3b27510f0f34142a9 /drivers/soc | |
| parent | 2dc794c527135e2c2b42a96793b480e32fb31f6b (diff) | |
| parent | bb73294fb71f02da055bc3d6222b89ed7cd46291 (diff) | |
Merge "soc: qcom: glink: Move ctx initialization of xprt ptr"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/glink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/glink.c b/drivers/soc/qcom/glink.c index 29e67d9fa389..ee0fe1622645 100644 --- a/drivers/soc/qcom/glink.c +++ b/drivers/soc/qcom/glink.c @@ -1935,6 +1935,7 @@ check_ctx: kfree(flcid); } + ctx->transport_ptr = xprt_ctx; list_add_tail(&ctx->port_list_node, &xprt_ctx->channels); GLINK_INFO_PERF_CH_XPRT(ctx, xprt_ctx, @@ -2640,7 +2641,6 @@ void *glink_open(const struct glink_open_config *cfg) ctx->local_xprt_req = best_id; ctx->no_migrate = cfg->transport && !(cfg->options & GLINK_OPT_INITIAL_XPORT); - ctx->transport_ptr = transport_ptr; ctx->local_open_state = GLINK_CHANNEL_OPENING; GLINK_INFO_PERF_CH(ctx, "%s: local:GLINK_CHANNEL_CLOSED->GLINK_CHANNEL_OPENING\n", |