From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: [PATCH] watchdog: fix typo in omap_wdt.c Date: Fri, 26 Sep 2008 20:52:38 +0300 Message-ID: <20080926175237.GD9890@frodo> References: <5A47E75E594F054BAF48C5E4FC4B92AB02D5DC959A@dbde02.ent.ti.com> Reply-To: me@felipebalbi.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from ns1.siteground211.com ([209.62.36.12]:39611 "EHLO serv01.siteground211.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752346AbYIZRwr (ORCPT ); Fri, 26 Sep 2008 13:52:47 -0400 Content-Disposition: inline In-Reply-To: <5A47E75E594F054BAF48C5E4FC4B92AB02D5DC959A@dbde02.ent.ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Gadiyar, Anand" Cc: "linux-omap@vger.kernel.org" , "felipe.balbi@nokia.com" On Fri, Sep 26, 2008 at 09:20:14PM +0530, Gadiyar, Anand wrote: > From: Anand Gadiyar > > Fix typo in omap_wdt.c introduced by a recent change > > Signed-off-by: Anand Gadiyar > --- > 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