Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 07:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: driver: s3c_camif: move s3c_camif_unregister_subdev out of camif_unregister_media_entities

Browse Source 
In the error handling of s3c_camif_probe, s3c_camif_unregister_subdev
may be executed twice, one is from camif_unregister_media_entities.
Although there is sanity check about the registration status,
it is not good to call s3c_camif_unregister_subdev twice in the error
handling code.

Fix this by moving s3c_camif_unregister_subdev out of
camif_unregister_media_entities, and add a s3c_camif_unregister_subdev
in the s3c_camif_remove.

Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Dongliang Mu 2021-10-19 05:39:52 +02:00 committed by Mauro Carvalho Chehab
parent 0529c0f55d
commit d5e9bddb28
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/s3c-camif/camif-core.c
View File

@ -291,7 +291,6 @@ static void camif_unregister_media_entities(struct camif_dev *camif)
{ {
camif_unregister_video_nodes(camif); camif_unregister_video_nodes(camif);
camif_unregister_sensor(camif); camif_unregister_sensor(camif);
s3c_camif_unregister_subdev(camif);
} }
/* /*
@ -520,6 +519,7 @@ static int s3c_camif_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
camif_clk_put(camif); camif_clk_put(camif);
s3c_camif_unregister_subdev(camif);
pdata->gpio_put(); pdata->gpio_put();
return 0; return 0;