Merge "msm: vidc: Free smem client after moving core to UNINIT" (aa61202b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/vidc/msm_vidc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1373,7 +1373,6 @@ static void cleanup_instance(struct msm_vidc_inst *inst)
		mutex_lock(&inst->lock);
		}
		mutex_unlock(&inst->lock);
		msm_smem_delete_client(inst->mem_client);
		debugfs_remove_recursive(inst->debugfs_root);
		WARN_ON(!list_empty(&inst->pending_getpropq));
		}
		@@ -1433,9 +1432,12 @@ int msm_vidc_close(void *instance)
		dprintk(VIDC_ERR,
		"Failed to move video instance to uninit state\n");

		msm_smem_delete_client(inst->mem_client);

		pr_info(VIDC_DBG_TAG "Closed video instance: %p\n",
		VIDC_MSG_PRIO2STRING(VIDC_INFO), inst);
		kfree(inst);

		return 0;
		}
		EXPORT_SYMBOL(msm_vidc_close);