Merge "msm: gsi: fix event ring handle in gsi_alloc_channel" (406cd379) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/gsi/gsi.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -1601,14 +1601,20 @@ int gsi_alloc_channel(struct gsi_chan_props *props, unsigned long dev_hdl,
		return -GSI_STATUS_INVALID_PARAMS;
		}

		if (props->evt_ring_hdl != ~0 &&
		atomic_read(&gsi_ctx->evtr[props->evt_ring_hdl].chan_ref_cnt) &&
		if (props->evt_ring_hdl != ~0) {
		if (props->evt_ring_hdl >= GSI_EVT_RING_MAX) {
		GSIERR("invalid evt ring=%lu\n", props->evt_ring_hdl);
		return -GSI_STATUS_INVALID_PARAMS;
		}

		if (atomic_read(
		&gsi_ctx->evtr[props->evt_ring_hdl].chan_ref_cnt) &&
		gsi_ctx->evtr[props->evt_ring_hdl].props.exclusive) {
		GSIERR("evt ring=%lu already in exclusive use chan_hdl=%p\n",
		GSIERR("evt ring=%lu exclusively used by chan_hdl=%p\n",
		props->evt_ring_hdl, chan_hdl);
		return -GSI_STATUS_UNSUPPORTED_OP;
		}

		}

		ctx = &gsi_ctx->chan[props->ch_id];
		if (ctx->allocated) {