From 06d98701ba10d38c5ab58ecd12d143a4c2d6cf81 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Sun, 4 Dec 2011 12:17:32 +0100 Subject: [PATCH] --- yaml --- r: 281317 b: refs/heads/master c: 88e09a5e30a2b768480ab52628043e7d30a0e079 h: refs/heads/master i: 281315: 15a3f749c9c12c7434eb6ba564c71ec35d41a0c4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d44cf07785ea..9c1e9a6c897c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 463ac7f7fe319a30543d9722164ab31ebffbafb3 +refs/heads/master: 88e09a5e30a2b768480ab52628043e7d30a0e079 diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c index c379bba4c178..72b7ff108200 100644 --- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c @@ -456,7 +456,7 @@ static ssize_t dcon_mono_store(struct device *dev, unsigned long enable_mono; int rc; - rc = strict_strtoul(buf, 10, &enable_mono); + rc = kstrtoul(buf, 10, &enable_mono); if (rc) return rc; @@ -472,7 +472,7 @@ static ssize_t dcon_freeze_store(struct device *dev, unsigned long output; int ret; - ret = strict_strtoul(buf, 10, &output); + ret = kstrtoul(buf, 10, &output); if (ret) return ret; @@ -517,7 +517,7 @@ static ssize_t dcon_sleep_store(struct device *dev, unsigned long output; int ret; - ret = strict_strtoul(buf, 10, &output); + ret = kstrtoul(buf, 10, &output); if (ret) return ret;