[PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code

[PATCH 5/5] drivers/media/platform/omap3isp/isp.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/omap3isp/isp.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index e0096e0..91fcaef 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2102,8 +2102,10 @@ static int __devinit isp_probe(struct platform_device *pdev)
 	if (ret < 0)
 		goto error;
 
-	if (__omap3isp_get(isp, false) = NULL)
+	if (__omap3isp_get(isp, false) = NULL) {
+		ret = -EBUSY; /* Not sure if EBUSY is best for here */
 		goto error;
+	}
 
 	ret = isp_reset(isp);
 	if (ret < 0)

Fwd: [PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code

[Mauro Carvalho Chehab]

[-- Attachment #1: Type: text/plain, Size: 1919 bytes --]

Laurent,

Could you please review this patch?

Peter,

Please, always c/c the driver maintainer/author on patches you submit.

You can check it with scripts/get_maintainer.pl.

Regards,
Mauro

-------- Mensagem original --------
Assunto: [PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code
Data: Tue,  4 Sep 2012 18:14:25 +0200
De: Peter Senna Tschudin <peter.senna@gmail.com>
Para: Mauro Carvalho Chehab <mchehab@infradead.org>
CC: kernel-janitors@vger.kernel.org, Julia.Lawall@lip6.fr, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org

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/omap3isp/isp.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index e0096e0..91fcaef 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2102,8 +2102,10 @@ static int __devinit isp_probe(struct platform_device *pdev)
 	if (ret < 0)
 		goto error;
 
-	if (__omap3isp_get(isp, false) == NULL)
+	if (__omap3isp_get(isp, false) == NULL) {
+		ret = -EBUSY; /* Not sure if EBUSY is best for here */
 		goto error;
+	}
 
 	ret = isp_reset(isp);
 	if (ret < 0)

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[-- Attachment #2: Seção da mensagem anexada --]
[-- Type: text/plain, Size: 0 bytes --]

Re: [PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code

[Peter Senna Tschudin]

On Sun, Sep 23, 2012 at 7:39 PM, Mauro Carvalho Chehab
<mchehab@redhat.com> wrote:
> Laurent,
>
> Could you please review this patch?
>
> Peter,
>
> Please, always c/c the driver maintainer/author on patches you submit.
>
> You can check it with scripts/get_maintainer.pl.
Sorry for that. I'll be more careful next time. Thanks!

>
> Regards,
> Mauro
>
> -------- Mensagem original --------
> Assunto: [PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code
> Data: Tue,  4 Sep 2012 18:14:25 +0200
> De: Peter Senna Tschudin <peter.senna@gmail.com>
> Para: Mauro Carvalho Chehab <mchehab@infradead.org>
> CC: kernel-janitors@vger.kernel.org, Julia.Lawall@lip6.fr, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
>
> 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/omap3isp/isp.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index e0096e0..91fcaef 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -2102,8 +2102,10 @@ static int __devinit isp_probe(struct platform_device *pdev)
>         if (ret < 0)
>                 goto error;
>
> -       if (__omap3isp_get(isp, false) = NULL)
> +       if (__omap3isp_get(isp, false) = NULL) {
> +               ret = -EBUSY; /* Not sure if EBUSY is best for here */
>                 goto error;
> +       }
>
>         ret = isp_reset(isp);
>         if (ret < 0)
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>



-- 
Peter

Re: [PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code

[Laurent Pinchart]

Hi,

On Sunday 23 September 2012 19:46:53 Peter Senna Tschudin wrote:
> On Sun, Sep 23, 2012 at 7:39 PM, Mauro Carvalho Chehab wrote:
> > Laurent,
> > 
> > Could you please review this patch?
> > 
> > Peter,
> > 
> > Please, always c/c the driver maintainer/author on patches you submit.
> > 
> > You can check it with scripts/get_maintainer.pl.
> 
> Sorry for that. I'll be more careful next time. Thanks!
> 
> > Regards,
> > Mauro
> > 
> > -------- Mensagem original --------
> > Assunto: [PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error
> > return code Data: Tue,  4 Sep 2012 18:14:25 +0200
> > De: Peter Senna Tschudin <peter.senna@gmail.com>
> > Para: Mauro Carvalho Chehab <mchehab@infradead.org>
> > CC: kernel-janitors@vger.kernel.org, Julia.Lawall@lip6.fr,
> > linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
> > 
> > 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/omap3isp/isp.c |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/media/platform/omap3isp/isp.c
> > b/drivers/media/platform/omap3isp/isp.c index e0096e0..91fcaef 100644
> > --- a/drivers/media/platform/omap3isp/isp.c
> > +++ b/drivers/media/platform/omap3isp/isp.c
> > @@ -2102,8 +2102,10 @@ static int __devinit isp_probe(struct
> > platform_device *pdev)> 
> >         if (ret < 0)
> >                 goto error;
> > 
> > -       if (__omap3isp_get(isp, false) = NULL)
> > +       if (__omap3isp_get(isp, false) = NULL) {
> > +               ret = -EBUSY; /* Not sure if EBUSY is best for here */

I've replaced -EBUSY with -ENODEV, removed the comment and applied the patch 
to my tree. Thanks.

> >                 goto error;
> > +       }
> > 
> >         ret = isp_reset(isp);
> >         if (ret < 0)

-- 
Regards,

Laurent Pinchart