summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-08 05:13:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-08 05:13:35 -0700
commit9c9b1543506eaa8ac110186b8c4adf416f4bf76d (patch)
tree87b5d706a74c58d616e27218ee6b5808f7fc4fb2
parent6c90c8860c5863fda38b2d2f3145c1d9b940d883 (diff)
parenta5e75c2fa7324034a7afa34db1b81ec381e0a2d3 (diff)
Merge "soc: qcom: glink_smem_native_xprt: recovery from SSR in tasklet only"
-rw-r--r--drivers/soc/qcom/glink_smem_native_xprt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/glink_smem_native_xprt.c b/drivers/soc/qcom/glink_smem_native_xprt.c
index 168db46084df..8385987e8888 100644
--- a/drivers/soc/qcom/glink_smem_native_xprt.c
+++ b/drivers/soc/qcom/glink_smem_native_xprt.c
@@ -849,7 +849,7 @@ static void __rx_worker(struct edge_info *einfo, bool atomic_ctx)
rcu_id = srcu_read_lock(&einfo->use_ref);
- if (unlikely(!einfo->rx_fifo)) {
+ if (unlikely(!einfo->rx_fifo) && atomic_ctx) {
if (!get_rx_fifo(einfo)) {
srcu_read_unlock(&einfo->use_ref, rcu_id);
return;