| From 9719e5954f0fa9914789cb5ec615440f8a98aadc Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= |
| <niklas.soderlund+renesas@ragnatech.se> |
| Date: Sat, 14 Apr 2018 07:56:58 -0400 |
| Subject: [PATCH 1284/1795] media: rcar-vin: unregister video device on driver |
| removal |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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 <niklas.soderlund+renesas@ragnatech.se> |
| Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| (cherry picked from commit a31ffe939f0d1e425ddf7b8468efa6e6b746a0be) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/media/platform/rcar-vin/rcar-core.c | 2 ++ |
| drivers/media/platform/rcar-vin/rcar-v4l2.c | 3 +++ |
| 2 files changed, 5 insertions(+) |
| |
| diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c |
| index f7a4c21909da..6d99542ec74b 100644 |
| --- 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 cab38e7a24a3..953e48ef3390 100644 |
| --- 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)); |
| |
| -- |
| 2.19.0 |
| |