summaryrefslogtreecommitdiff
path: root/drivers/staging/olpc_dcon/olpc_dcon.c
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-06 14:38:16 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-09 12:11:53 -0800
commitfe2d5b43807ebb38e0e8c7b269ff08fcd4011726 (patch)
tree4b328bc041e811b57f1a12fc2fe16b460624f7ff /drivers/staging/olpc_dcon/olpc_dcon.c
parent2ef0c05e80cf59315f6f0a4e5a950899f169f2d0 (diff)
staging: olpc_dcon: revert strtoul change
On Fri, 4 Feb 2011 15:44:43 -0800 From: Andres Salomon <dilinger@queued.net> 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@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/olpc_dcon/olpc_dcon.c')
-rw-r--r--drivers/staging/olpc_dcon/olpc_dcon.c2
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 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))