diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-02-11 22:07:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-15 20:51:05 +0100 |
| commit | a7155f4e2252be167fa69468e11b19a3fac5e625 (patch) | |
| tree | e369e95827caa393acdb407304b1eb21388ad60e /drivers/w1 | |
| parent | FMC: show_sdb_tree: fix offset calculation (diff) | |
| download | linux-a7155f4e2252be167fa69468e11b19a3fac5e625.tar.xz linux-a7155f4e2252be167fa69468e11b19a3fac5e625.zip | |
w1: small type cleanup in sysfs
On 64 bit systems, a large value for "long tmp" is truncated when
assigning to "int md->max_slave_count" so we still end up with a value
less than one despite the "tmp < 1" check.
This is more of a problem for static checkers than a real life issue,
but it's simple enough to fix.
Acked-by: David Fries <david@fries.net>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/w1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 9eb816b2ea5e..b96f61b15dc6 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -320,10 +320,10 @@ static ssize_t w1_master_attribute_show_timeout(struct device *dev, struct devic static ssize_t w1_master_attribute_store_max_slave_count(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - long tmp; + int tmp; struct w1_master *md = dev_to_w1_master(dev); - if (kstrtol(buf, 0, &tmp) == -EINVAL || tmp < 1) + if (kstrtoint(buf, 0, &tmp) == -EINVAL || tmp < 1) return -EINVAL; mutex_lock(&md->mutex); |