media: rcar-vin: unregister video device on driver removal

If the video device was registered by the complete() callback it should
be unregistered when a device is unbound from the driver. Protect from
printing an uninitialized video device node name by adding a check in
rvin_v4l2_unregister() to identify that the video device is registered.

Signed-off-by: Niklas Söderlund <[email protected]>
Reviewed-by: Kieran Bingham <[email protected]>
Acked-by: Laurent Pinchart <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 2bedf20abcf3ca07f44decf9a45347d63bb49caf..47f06acde2e698f23841652ed0f418761060c58c 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -272,6 +272,8 @@ static int rcar_vin_remove(struct platform_device *pdev)
 
        pm_runtime_disable(&pdev->dev);
 
+       rvin_v4l2_unregister(vin);
+
        v4l2_async_notifier_unregister(&vin->notifier);
        v4l2_async_notifier_cleanup(&vin->notifier);
 

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index cab38e7a24a3c23c6391f2758b6fd382f39b7d83..953e48ef33905113a2d7874e7b567cc81b7ac199 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -841,6 +841,9 @@ static const struct v4l2_file_operations rvin_fops = {
 
 void rvin_v4l2_unregister(struct rvin_dev *vin)
 {
+       if (!video_is_registered(&vin->vdev))
+               return;
+
        v4l2_info(&vin->v4l2_dev, "Removing %s\n",
                  video_device_node_name(&vin->vdev));