From b5a35219cea861509832e97b36d2ecc187672ef2 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 5 Dec 2011 11:02:35 +0100 Subject: [PATCH] --- yaml --- r: 281318 b: refs/heads/master c: c542341dff7cd818015247d290aa0971888a7b08 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9c1e9a6c897c..9d1dfe4a7aa4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88e09a5e30a2b768480ab52628043e7d30a0e079 +refs/heads/master: c542341dff7cd818015247d290aa0971888a7b08 diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c index 72b7ff108200..3d9199320d86 100644 --- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c @@ -34,8 +34,8 @@ /* Module definitions */ -static int resumeline = 898; -module_param(resumeline, int, 0444); +static ushort resumeline = 898; +module_param(resumeline, ushort, 0444); /* Default off since it doesn't work on DCON ASIC in B-test OLPC board */ static int useaa = 1; @@ -498,10 +498,10 @@ static ssize_t dcon_freeze_store(struct device *dev, static ssize_t dcon_resumeline_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - unsigned long rl; + unsigned short rl; int rc; - rc = strict_strtoul(buf, 10, &rl); + rc = kstrtou16(buf, 10, &rl); if (rc) return rc;