Merge "msm: adsprpc: Open APPS SMD channel forever" (e54c92a9) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/char/adsprpc.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -2819,11 +2819,10 @@ static void fastrpc_channel_close(struct kref *kref)

		ctx = container_of(kref, struct fastrpc_channel_ctx, kref);
		cid = ctx - &gcinfo[0];
		if (!me->glink)
		smd_close(ctx->chan);
		else
		if (me->glink) {
		fastrpc_glink_close(ctx->chan, cid);
		ctx->chan = NULL;
		}
		mutex_unlock(&me->smd_mutex);
		pr_info("'closed /dev/%s c %d %d'\n", gcinfo[cid].name,
		MAJOR(me->dev_no), cid);
		@@ -3436,16 +3435,23 @@ static int fastrpc_channel_open(struct fastrpc_file *fl)
		if (err)
		goto bail;
		VERIFY(err, 0 == fastrpc_glink_open(cid));
		VERIFY(err,
		wait_for_completion_timeout(&me->channel[cid].workport,
		RPC_TIMEOUT));
		} else {
		VERIFY(err, !smd_named_open_on_edge(FASTRPC_SMD_GUID,
		if (me->channel[cid].chan == NULL) {
		VERIFY(err, !smd_named_open_on_edge(
		FASTRPC_SMD_GUID,
		gcinfo[cid].channel,
		(smd_channel_t **)&me->channel[cid].chan,
		(void *)(uintptr_t)cid,
		smd_event_handler));
		}
		VERIFY(err,
		wait_for_completion_timeout(&me->channel[cid].workport,
		RPC_TIMEOUT));

		}
		}
		if (err) {
		me->channel[cid].chan = NULL;
		goto bail;