From 5b2e834d48f7d682af7a68625aeac6418e324f01 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Dec 2011 12:12:44 +0100 Subject: [PATCH] --- yaml --- r: 281327 b: refs/heads/master c: 2e1c394fc398afb75d89c53f933149d33dc9e280 h: refs/heads/master i: 281325: 258e43d6aed2156fd424ee40bb2c883c889498cd 281323: 8477c6b6645a488761bcdbe8de60b39c52710401 281319: 85fa3942bd5c6a7ea06b0d32bb822c75e3e0d6a9 281311: ceabfdb2d76408720792a9c2bfea080139904db1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 32 ++++++++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 34410817671b..69c2b56eb827 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 877a0893e3751022d2e60bea54dd5ac2e4026997 +refs/heads/master: 2e1c394fc398afb75d89c53f933149d33dc9e280 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 21d8c1c16cd8..60200b46be0b 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -2429,13 +2429,15 @@ static ssize_t store_max_read_buffer_kb(struct device *dev, const char *buf, size_t count) { struct comedi_device_file_info *info = dev_get_drvdata(dev); - unsigned long new_max_size_kb; + unsigned int new_max_size_kb; uint64_t new_max_size; + int ret; struct comedi_subdevice *const read_subdevice = comedi_get_read_subdevice(info); - if (strict_strtoul(buf, 10, &new_max_size_kb)) - return -EINVAL; + ret = kstrtouint(buf, 10, &new_max_size_kb); + if (ret) + return ret; if (new_max_size_kb != (uint32_t) new_max_size_kb) return -EINVAL; new_max_size = ((uint64_t) new_max_size_kb) * bytes_per_kibi; @@ -2490,14 +2492,16 @@ static ssize_t store_read_buffer_kb(struct device *dev, const char *buf, size_t count) { struct comedi_device_file_info *info = dev_get_drvdata(dev); - unsigned long new_size_kb; + unsigned int new_size_kb; uint64_t new_size; int retval; + int ret; struct comedi_subdevice *const read_subdevice = comedi_get_read_subdevice(info); - if (strict_strtoul(buf, 10, &new_size_kb)) - return -EINVAL; + ret = kstrtouint(buf, 10, &new_size_kb); + if (ret) + return ret; if (new_size_kb != (uint32_t) new_size_kb) return -EINVAL; new_size = ((uint64_t) new_size_kb) * bytes_per_kibi; @@ -2556,13 +2560,15 @@ static ssize_t store_max_write_buffer_kb(struct device *dev, const char *buf, size_t count) { struct comedi_device_file_info *info = dev_get_drvdata(dev); - unsigned long new_max_size_kb; + unsigned int new_max_size_kb; uint64_t new_max_size; + int ret; struct comedi_subdevice *const write_subdevice = comedi_get_write_subdevice(info); - if (strict_strtoul(buf, 10, &new_max_size_kb)) - return -EINVAL; + ret = kstrtouint(buf, 10, &new_max_size_kb); + if (ret) + return ret; if (new_max_size_kb != (uint32_t) new_max_size_kb) return -EINVAL; new_max_size = ((uint64_t) new_max_size_kb) * bytes_per_kibi; @@ -2617,14 +2623,16 @@ static ssize_t store_write_buffer_kb(struct device *dev, const char *buf, size_t count) { struct comedi_device_file_info *info = dev_get_drvdata(dev); - unsigned long new_size_kb; + unsigned int new_size_kb; uint64_t new_size; int retval; + int ret; struct comedi_subdevice *const write_subdevice = comedi_get_write_subdevice(info); - if (strict_strtoul(buf, 10, &new_size_kb)) - return -EINVAL; + ret = kstrtouint(buf, 10, &new_size_kb); + if (ret) + return ret; if (new_size_kb != (uint32_t) new_size_kb) return -EINVAL; new_size = ((uint64_t) new_size_kb) * bytes_per_kibi;