media: venus: core: Drop second v4l2 device unregister

Wrong solution of rebase conflict leads to calling twice
v4l2_device_unregister in .venus_remove. Delete the second one.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 00d6883d3859f9c05f0e2034899bccd085174e3c..a38d5aa53727c3b13669e736a0b573df31901cd6 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -368,8 +368,6 @@ static int venus_remove(struct platform_device *pdev)
 
        hfi_destroy(core);
 
-       v4l2_device_unregister(&core->v4l2_dev);
-
        mutex_destroy(&core->pm_lock);
        mutex_destroy(&core->lock);
        venus_dbgfs_deinit(core);