Commit a7155f4e authored Feb 12, 2014 by Dan Carpenter Committed by Greg Kroah-Hartman Feb 15, 2014

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>

parent 83b1bfba

drivers/w1/w1.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message