driver: s3c_camif: move s3c_camif_unregister_subdev out of camif_unregister_media_entities
Subsystems (2)
PATCH 1/1 driver: s3c_camif: move s3c_camif_unregister_subdev out of camif_unregister_media_entities
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 <[email protected]>
--- drivers/media/platform/s3c-camif/camif-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/s3c-camif/camif-core.c +1 -1
@@ -292,7 +292,6 @@ static void camif_unregister_media_entities(struct camif_dev *camif) {camif_unregister_video_nodes (camif);camif_unregister_sensor (camif); -s3c_camif_unregister_subdev (camif); }/*
@@ -524,6 +523,7 @@ static int s3c_camif_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev);camif_clk_put (camif); +s3c_camif_unregister_subdev (camif); pdata->gpio_put ();return 0 ;
Signature · 1 line
2.25.1