On Fri, 4 Feb 2011 15:44:43 -0800
Greg KH <gregkh@xxxxxxx> wrote:
> On Fri, Feb 04, 2011 at 03:23:41PM -0800, Andres Salomon wrote:
> > No opinions on this patch (there are some things I'd do differently,
> > but overall it looks fine). I'd just like to ensure that if it's
> > merged, it gets into Linus's tree quickly so that the DCON reworking
> > that I'm planning to do doesn't get sidetracked by conflicts.
>
> It is planned to go to Linus for .39 and is now in the linux-next tree
> as of tomorrow.
>
> thanks,
>
> greg k-h
Ugh, this actually causes build warnings and causes XOs to fail to
boot. Seems like the strict_strtoul change broke things; this patch
backs that out. We can fix it properly later.
Greg, can you please apply?
From: Andres Salomon <dilinger@xxxxxxxxxx>
The s/simple_strtoul/strict_strtoul/ from commit e107e6eb added a build
warning, as well as an oops. This reverts that change.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
---
drivers/staging/olpc_dcon/olpc_dcon.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index b19cd34..d6ad5d7 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -525,7 +525,7 @@ static int _strtoul(const char *buf, int len, unsigned int *val)
{
char *endp;
- unsigned int output = strict_strtoul(buf, &endp, 0);
+ unsigned int output = simple_strtoul(buf, &endp, 0);
int size = endp - buf;
if (*endp && isspace(*endp))
--
1.7.2.3
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
