[PATCH] watchdog: fix typo in omap_wdt.c

[PATCH] watchdog: fix typo in omap_wdt.c

[Gadiyar, Anand]

From: Anand Gadiyar <gadiyar@ti.com>

Fix typo in omap_wdt.c introduced by a recent change

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
---
 drivers/watchdog/omap_wdt.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: tony/drivers/watchdog/omap_wdt.c
===================================================================
--- tony.orig/drivers/watchdog/omap_wdt.c	2008-09-25 16:45:08.000000000 +0530
+++ tony/drivers/watchdog/omap_wdt.c	2008-09-26 21:14:48.059042569 +0530
@@ -283,7 +283,7 @@ static int __init omap_wdt_probe(struct 
 	}
 
 	if (omap_wdt_dev) {
-		ret - EBUSY;
+		ret = -EBUSY;
 		goto err_busy;
 	}
 

Re: [PATCH] watchdog: fix typo in omap_wdt.c

[Felipe Balbi]

On Fri, Sep 26, 2008 at 09:20:14PM +0530, Gadiyar, Anand wrote:
> From: Anand Gadiyar <gadiyar@ti.com>
> 
> Fix typo in omap_wdt.c introduced by a recent change
> 
> Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> ---
>  drivers/watchdog/omap_wdt.c |    2 +-
>  1 files changed, 1 insertion(+), 1 deletion(-)
> 
> Index: tony/drivers/watchdog/omap_wdt.c
> ===================================================================
> --- tony.orig/drivers/watchdog/omap_wdt.c	2008-09-25 16:45:08.000000000 +0530
> +++ tony/drivers/watchdog/omap_wdt.c	2008-09-26 21:14:48.059042569 +0530
> @@ -283,7 +283,7 @@ static int __init omap_wdt_probe(struct 
>  	}
>  
>  	if (omap_wdt_dev) {
> -		ret - EBUSY;
> +		ret = -EBUSY;
>  		goto err_busy;
>  	}

Those patches weren't applied to linux-omap yet, so this change should
be melded into the patch that introduced it. It's better to resend that
patch then to create a messed up bisect line.

-- 
balbi

RE: [PATCH] watchdog: fix typo in omap_wdt.c

[Gadiyar, Anand]

> -----Original Message-----
> From: Felipe Balbi [mailto:me@felipebalbi.com] 
> Sent: Friday, September 26, 2008 11:23 PM
> To: Gadiyar, Anand
> Cc: linux-omap@vger.kernel.org; felipe.balbi@nokia.com
> Subject: Re: [PATCH] watchdog: fix typo in omap_wdt.c
> 
> On Fri, Sep 26, 2008 at 09:20:14PM +0530, Gadiyar, Anand wrote:
> > From: Anand Gadiyar <gadiyar@ti.com>
> > 
> > Fix typo in omap_wdt.c introduced by a recent change
> > 
> > Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> > ---
> >  drivers/watchdog/omap_wdt.c |    2 +-
> >  1 files changed, 1 insertion(+), 1 deletion(-)
> > 
> > Index: tony/drivers/watchdog/omap_wdt.c
> > ===================================================================
> > --- tony.orig/drivers/watchdog/omap_wdt.c	2008-09-25 
> 16:45:08.000000000 +0530
> > +++ tony/drivers/watchdog/omap_wdt.c	2008-09-26 
> 21:14:48.059042569 +0530
> > @@ -283,7 +283,7 @@ static int __init omap_wdt_probe(struct 
> >  	}
> >  
> >  	if (omap_wdt_dev) {
> > -		ret - EBUSY;
> > +		ret = -EBUSY;
> >  		goto err_busy;
> >  	}
> 
> Those patches weren't applied to linux-omap yet, so this change should
> be melded into the patch that introduced it. It's better to 
> resend that
> patch then to create a messed up bisect line.
> 
> -- 
> balbi

Of course they were merged. I saw this warning when I compiled linux-omap,
when sending in that pin-muxing patch.

- Anand

Re: [PATCH] watchdog: fix typo in omap_wdt.c

[Felipe Balbi]

On Fri, Sep 26, 2008 at 11:32:13PM +0530, Gadiyar, Anand wrote:
> > -----Original Message-----
> > From: Felipe Balbi [mailto:me@felipebalbi.com] 
> > Sent: Friday, September 26, 2008 11:23 PM
> > To: Gadiyar, Anand
> > Cc: linux-omap@vger.kernel.org; felipe.balbi@nokia.com
> > Subject: Re: [PATCH] watchdog: fix typo in omap_wdt.c
> > 
> > On Fri, Sep 26, 2008 at 09:20:14PM +0530, Gadiyar, Anand wrote:
> > > From: Anand Gadiyar <gadiyar@ti.com>
> > > 
> > > Fix typo in omap_wdt.c introduced by a recent change
> > > 
> > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> > > ---
> > >  drivers/watchdog/omap_wdt.c |    2 +-
> > >  1 files changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > Index: tony/drivers/watchdog/omap_wdt.c
> > > ===================================================================
> > > --- tony.orig/drivers/watchdog/omap_wdt.c	2008-09-25 
> > 16:45:08.000000000 +0530
> > > +++ tony/drivers/watchdog/omap_wdt.c	2008-09-26 
> > 21:14:48.059042569 +0530
> > > @@ -283,7 +283,7 @@ static int __init omap_wdt_probe(struct 
> > >  	}
> > >  
> > >  	if (omap_wdt_dev) {
> > > -		ret - EBUSY;
> > > +		ret = -EBUSY;
> > >  		goto err_busy;
> > >  	}
> > 
> > Those patches weren't applied to linux-omap yet, so this change should
> > be melded into the patch that introduced it. It's better to 
> > resend that
> > patch then to create a messed up bisect line.
> > 
> > -- 
> > balbi
> 
> Of course they were merged. I saw this warning when I compiled linux-omap,
> when sending in that pin-muxing patch.

You're right, at first look I thought this was for omap_hdq.c :-p

Anyways, this patch should go also to Wim. Please send a copy of this
patch to him so he can apply to his tree as well, btw, here's his mail:

Wim Van Sebroeck <wim@iguana.be>

-- 
balbi

RE: [PATCH] watchdog: fix typo in omap_wdt.c

[Gadiyar, Anand]

<snip> 

> > > Those patches weren't applied to linux-omap yet, so this change should
> > > be melded into the patch that introduced it. It's better to resend that
> > > patch then to create a messed up bisect line.
> > > 
> > > -- 
> > > balbi
> > 
> > Of course they were merged. I saw this warning when I compiled linux-omap,
> > when sending in that pin-muxing patch.
> 
> You're right, at first look I thought this was for omap_hdq.c :-p
> 
> Anyways, this patch should go also to Wim. Please send a copy of this
> patch to him so he can apply to his tree as well, btw, here's 
> his mail:
> 
> Wim Van Sebroeck <wim@iguana.be>
> 

Done. I'm guessing I don't need to CC linux-omap on that. Let me know if
I should have. I've sent it to Wim, with a CC to you (Felipe).

- Anand

Re: [PATCH] watchdog: fix typo in omap_wdt.c

[Felipe Balbi]

On Mon, Sep 29, 2008 at 09:56:06AM +0530, Gadiyar, Anand wrote:
> <snip> 
> 
> > > > Those patches weren't applied to linux-omap yet, so this change should
> > > > be melded into the patch that introduced it. It's better to resend that
> > > > patch then to create a messed up bisect line.
> > > > 
> > > > -- 
> > > > balbi
> > > 
> > > Of course they were merged. I saw this warning when I compiled linux-omap,
> > > when sending in that pin-muxing patch.
> > 
> > You're right, at first look I thought this was for omap_hdq.c :-p
> > 
> > Anyways, this patch should go also to Wim. Please send a copy of this
> > patch to him so he can apply to his tree as well, btw, here's 
> > his mail:
> > 
> > Wim Van Sebroeck <wim@iguana.be>
> > 
> 
> Done. I'm guessing I don't need to CC linux-omap on that. Let me know if
> I should have. I've sent it to Wim, with a CC to you (Felipe).

I think you can send it to l-o so we avoid these kinds of bugs. Tony,
what do you say ?

-- 
balbi

RE: [PATCH] watchdog: fix typo in omap_wdt.c

[Gadiyar, Anand]

> -----Original Message-----
> From: Felipe Balbi [mailto:me@felipebalbi.com] 
> On Mon, Sep 29, 2008 at 09:56:06AM +0530, Gadiyar, Anand wrote:
> > <snip> 
> > 
> > > > > Those patches weren't applied to linux-omap yet, so this change should
> > > > > be melded into the patch that introduced it. It's better to resend that
> > > > > patch then to create a messed up bisect line.
> > > > > 
> > > > > -- 
> > > > > balbi
> > > > 
> > > > Of course they were merged. I saw this warning when I compiled linux-omap,
> > > > when sending in that pin-muxing patch.
> > > 
> > > You're right, at first look I thought this was for omap_hdq.c :-p
> > > 
> > > Anyways, this patch should go also to Wim. Please send a copy of this
> > > patch to him so he can apply to his tree as well, btw, here's 
> > > his mail:
> > > 
> > > Wim Van Sebroeck <wim@iguana.be>
> > > 
> > 
> > Done. I'm guessing I don't need to CC linux-omap on that. 
> Let me know if
> > I should have. I've sent it to Wim, with a CC to you (Felipe).
> 
> I think you can send it to l-o so we avoid these kinds of bugs. Tony,
> what do you say ?
> 

I meant, I've already sent it to l-o, and I sent the same patch out to
Wim... When I sent it out the second time, I thought I need not CC l-o
on that second mail. Now I'm thinking I should have. So never mind.

- Anand