Skip to content

Commit

Permalink
w1: small type cleanup in sysfs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Feb 15, 2014
1 parent 83b1bfb commit a7155f4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/w1/w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a7155f4

Please sign in to comment.