media: venus: core: Drop second v4l2 device unregister
commit ddbcd0c58a6a53e2f1600b9de0ce6a20667c031c upstream. 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> Cc: Martin Faltesek <mfaltesek@google.com> Cc: Guenter Roeck <groeck@google.com> Cc: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
83d5196b65
commit
e651772adc
@ -375,8 +375,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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user