| Message ID | 20171129194342.26239-4-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Niklas, Thankyou for the patch. Only the grammar police here again :) On 29/11/17 19:43, Niklas Söderlund wrote: > If the video device was registered by the complete() callback it should > be unregistered when the driver is removed. Protect from printing a /printing a/printing an/ > uninitialized video device node name by adding a checking in /checking/check/ > rvin_v4l2_unregister() by checking that the video device is registered. /by checking/to identify/ > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > 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 f7a4c21909da6923..6d99542ec74b49a7 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 178aecc94962abe2..32a658214f48fa49 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)); > >
On 11/29/2017 08:43 PM, Niklas Söderlund wrote: > If the video device was registered by the complete() callback it should > be unregistered when the driver is removed. Protect from printing a > uninitialized video device node name by adding a checking in > rvin_v4l2_unregister() by checking that the video device is registered. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans > --- > 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 f7a4c21909da6923..6d99542ec74b49a7 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 178aecc94962abe2..32a658214f48fa49 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)); > >
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index f7a4c21909da6923..6d99542ec74b49a7 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 178aecc94962abe2..32a658214f48fa49 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));
If the video device was registered by the complete() callback it should be unregistered when the driver is removed. Protect from printing a uninitialized video device node name by adding a checking in rvin_v4l2_unregister() by checking that the video device is registered. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/media/platform/rcar-vin/rcar-core.c | 2 ++ drivers/media/platform/rcar-vin/rcar-v4l2.c | 3 +++ 2 files changed, 5 insertions(+)