From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Mon, 5 Jan 2015 14:20:54 +0000 (+0100)
Subject: hwmon: (ina2xx) don't accept shunt values greater than the calibration factor
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e794704000cf7954039b8daab9dfae2a74142f07;p=deliverable%2Flinux.git

hwmon: (ina2xx) don't accept shunt values greater than the calibration factor

Shunt resistance values greater than the chip's calibration factor make no
sense since the actual value written to the register equals:

	<calibration factor> / <shunt>

Bail-out from ina2xx_probe() if the configured value is greater than the
calibration factor.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---

diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index 39e017bf92fd..3234e571805c 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -313,7 +313,8 @@ static int ina2xx_probe(struct i2c_client *client,
 	data->config = &ina2xx_config[data->kind];
 	data->client = client;
 
-	if (data->rshunt <= 0)
+	if (data->rshunt <= 0 ||
+	    data->rshunt > data->config->calibration_factor)
 		return -ENODEV;
 
 	ret = ina2xx_init(data);