Merge 332abefb4523ca63a1a4751c9b6795b25bd18e2e on remote branch (89b15cea) · Commits · e / devices / android_kernel_oneplus_sm7250

msm/vidc/msm_cvp_internal.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -142,7 +142,6 @@ void handle_session_unregister_buffer_done(enum hal_command_response cmd,
		break;
		}
		}
		mutex_unlock(&inst->cvpbufs.lock);
		if (!found) {
		s_vpr_e(inst->sid, "%s: client_data %x not found\n",
		__func__, response->data.unregbuf.client_data);
		@@ -164,12 +163,11 @@ void handle_session_unregister_buffer_done(enum hal_command_response cmd,
		data[3] = cbuf->buf.offset;
		v4l2_event_queue_fh(&inst->event_handler, &event);

		mutex_lock(&inst->cvpbufs.lock);
		list_del(&cbuf->list);
		mutex_unlock(&inst->cvpbufs.lock);
		kfree(cbuf);
		cbuf = NULL;
		exit:
		mutex_unlock(&inst->cvpbufs.lock);
		s_vpr_l(inst->sid, "handled: SESSION_UNREGISTER_BUFFER_DONE\n");
		put_inst(inst);
		}
		@@ -432,9 +430,9 @@ static int msm_cvp_unregister_buffer(struct msm_vidc_inst *inst,
		break;
		}
		}
		mutex_unlock(&inst->cvpbufs.lock);
		if (!found) {
		print_client_buffer(VIDC_ERR, "invalid", inst, buf);
		mutex_unlock(&inst->cvpbufs.lock);
		return -EINVAL;
		}

		@@ -450,6 +448,7 @@ static int msm_cvp_unregister_buffer(struct msm_vidc_inst *inst,
		if (rc)
		print_cvp_buffer(VIDC_ERR, "unregister failed", inst, cbuf);

		mutex_unlock(&inst->cvpbufs.lock);
		return rc;
		}