Unverified Commit 1aa1b918 authored Jul 06, 2018 by Dan Carpenter Committed by Mark Brown Jul 09, 2018

regulator: max8997: clean up a condition in max8997_list_voltage()



The current code generates a static cehcker warnings because "rid < 0"
is always false:

    drivers/regulator/max8997-regulator.c:169 max8997_list_voltage()
    warn: condition is always false

The problem is that because of type promotion, if "rid" is negative the
comparison against ARRAY_SIZE() is type promoted to size_t and it's
treated as a very high positive value.  I've changed the order of the
checks so now everyone is happy.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent ed1ae2dd

drivers/regulator/max8997-regulator.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -165,8 +165,7 @@ static int max8997_list_voltage(struct regulator_dev *rdev,
		int rid = rdev_get_id(rdev);
		int val;

		if (rid >= ARRAY_SIZE(reg_voltage_map) \|\|
		rid < 0)
		if (rid < 0 \|\| rid >= ARRAY_SIZE(reg_voltage_map))
		return -EINVAL;

		desc = reg_voltage_map[rid];

Admin message