summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-14 03:40:31 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-14 03:40:30 -0700
commitb2799f1e25b3fbec3741930d73595c65bec752b5 (patch)
treea092c3fecbacbf878818bc988cddad2c216a5a6a
parent65767b7f53b3870d7663f9fa282ec4a6de786d49 (diff)
parent28494e0862746e60c8a5eb3bff70a4c360eefbd8 (diff)
Merge "soc: qcom: glink: Fix ctx initialization with magic number"
-rw-r--r--drivers/soc/qcom/glink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/glink.c b/drivers/soc/qcom/glink.c
index 1b1b14ec732e..9cfca014c8ad 100644
--- a/drivers/soc/qcom/glink.c
+++ b/drivers/soc/qcom/glink.c
@@ -2583,6 +2583,7 @@ void *glink_open(const struct glink_open_config *cfg)
ctx->notify_tx_abort = cfg->notify_tx_abort;
ctx->notify_rx_tracer_pkt = cfg->notify_rx_tracer_pkt;
ctx->notify_remote_rx_intent = cfg->notify_remote_rx_intent;
+ ctx->magic_number = GLINK_CTX_CANARY;
if (!ctx->notify_rx_intent_req)
ctx->notify_rx_intent_req = glink_dummy_notify_rx_intent_req;
@@ -2618,7 +2619,6 @@ void *glink_open(const struct glink_open_config *cfg)
GLINK_INFO_CH(ctx, "%s: Created channel, sent OPEN command. ctx %p\n",
__func__, ctx);
- ctx->magic_number = GLINK_CTX_CANARY;
return ctx;
}
EXPORT_SYMBOL(glink_open);