From: Andres Salomon Date: Sun, 6 Feb 2011 22:38:16 +0000 (-0800) Subject: staging: olpc_dcon: revert strtoul change X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fe2d5b43807ebb38e0e8c7b269ff08fcd4011726;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: olpc_dcon: revert strtoul change On Fri, 4 Feb 2011 15:44:43 -0800 From: Andres Salomon 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index b19cd349f933..d6ad5d7a1457 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))