[PATCH 3/5] drivers/media/platform/s5p-tv/mixer_video.c: fix error return code

[PATCH 3/5] drivers/media/platform/s5p-tv/mixer_video.c: fix error return code

[Peter Senna Tschudin]

From: Peter Senna Tschudin <peter.senna@gmail.com>

Convert a nonnegative error return code to a negative one, as returned
elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>

---
 drivers/media/platform/s5p-tv/mixer_video.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index a9c6be3..f139fed 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -83,6 +83,7 @@ int __devinit mxr_acquire_video(struct mxr_device *mdev,
 	mdev->alloc_ctx = vb2_dma_contig_init_ctx(mdev->dev);
 	if (IS_ERR_OR_NULL(mdev->alloc_ctx)) {
 		mxr_err(mdev, "could not acquire vb2 allocator\n");
+		ret = -ENODEV;
 		goto fail_v4l2_dev;
 	}
 
@@ -764,8 +765,10 @@ static int mxr_video_open(struct file *file)
 	}
 
 	/* leaving if layer is already initialized */
-	if (!v4l2_fh_is_singular_file(file))
+	if (!v4l2_fh_is_singular_file(file)) {
+		ret = -EBUSY; /* Not sure if EBUSY is the best for here */
 		goto unlock;
+	}
 
 	/* FIXME: should power be enabled on open? */
 	ret = mxr_power_get(mdev);

Re: [PATCH 3/5] drivers/media/platform/s5p-tv/mixer_video.c: fix error return code

[Ezequiel Garcia]

Hi Peter,

On Tue, Sep 4, 2012 at 1:14 PM, Peter Senna Tschudin
<peter.senna@gmail.com> wrote:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Convert a nonnegative error return code to a negative one, as returned
> elsewhere in the function.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> (
> if@p1 (\(ret < 0\|ret != 0\))
>  { ... return ret; }
> |
> ret@p1 = 0
> )
> ... when != ret = e1
>     when != &ret
> *if(...)
> {
>   ... when != ret = e2
>       when forall
>  return ret;
> }
>
> // </smpl>
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
>
> ---
>  drivers/media/platform/s5p-tv/mixer_video.c |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
> index a9c6be3..f139fed 100644
> --- a/drivers/media/platform/s5p-tv/mixer_video.c
> +++ b/drivers/media/platform/s5p-tv/mixer_video.c
> @@ -83,6 +83,7 @@ int __devinit mxr_acquire_video(struct mxr_device *mdev,
>         mdev->alloc_ctx = vb2_dma_contig_init_ctx(mdev->dev);
>         if (IS_ERR_OR_NULL(mdev->alloc_ctx)) {
>                 mxr_err(mdev, "could not acquire vb2 allocator\n");
> +               ret = -ENODEV;
>                 goto fail_v4l2_dev;
>         }
>
> @@ -764,8 +765,10 @@ static int mxr_video_open(struct file *file)
>         }
>
>         /* leaving if layer is already initialized */
> -       if (!v4l2_fh_is_singular_file(file))
> +       if (!v4l2_fh_is_singular_file(file)) {
> +               ret = -EBUSY; /* Not sure if EBUSY is the best for here */
>                 goto unlock;
> +       }
>
>         /* FIXME: should power be enabled on open? */
>         ret = mxr_power_get(mdev);
>

Well, same to say here. I think if you look at this functions you'll realize
it's so much easy to just initialize ret to something, instead of the obviously
wrong ret = 0.

IMO, initializing ret to zero it's a free ticket to bugs. :-)

Hope it helps,
Ezequiel.