summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStanimir Varbanov <stanimir.varbanov@linaro.org>2021-03-24 15:59:17 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-04-06 14:48:15 +0200
commitddbcd0c58a6a53e2f1600b9de0ce6a20667c031c (patch)
tree2bc31cf2880ecc040ddd964b791adb0b17f8baba /drivers
parent2f3eb922cd5b72a58e5b7c8fe036f4be60be9397 (diff)
downloadlinux-stable-ddbcd0c58a6a53e2f1600b9de0ce6a20667c031c.tar.gz
linux-stable-ddbcd0c58a6a53e2f1600b9de0ce6a20667c031c.tar.bz2
linux-stable-ddbcd0c58a6a53e2f1600b9de0ce6a20667c031c.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/qcom/venus/core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 00d6883d3859..a38d5aa53727 100644
--- 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);