Skip to contentSkip to conversation

hwmon: (ina2xx) fix sysfs shunt resistor read access

PATCH Applied Lothar Felten 2 participants 2 messages Aug 14, 2018

Subsystems (2)
Documentation Hardware monitoring
lore
Share & tools
lore

Lothar Felten

author
#0 lore raw

PATCH 1/1 hwmon: (ina2xx) fix sysfs shunt resistor read access

fix the sysfs shunt resistor read access: return the shunt resistor value, not the calibration register contents.

update email address

Signed-off-by Lothar Felten <[email protected]>
---
 Documentation/hwmon/ina2xx           |  2 +-
 drivers/hwmon/ina2xx.c               | 13 +++++++++++--
 include/linux/platform_data/ina2xx.h |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
Documentation/hwmon/ina2xx +1 -1
index 72d16f08e431..b8df81f6d6bc 100644
@@ -32,7 +32,7 @@ Supported chips:
     Datasheet: Publicly available at the Texas Instruments website
                http://www.ti.com/
 
-Author: Lothar Felten <[email protected]>
+Author: Lothar Felten <[email protected]>
 
 Description
 -----------
drivers/hwmon/ina2xx.c +11 -2
index e9e6aeabbf84..71d3445ba869 100644
@@ -17,7 +17,7 @@
  * Bi-directional Current/Power Monitor with I2C Interface
  * Datasheet: http://www.ti.com/product/ina230
  *
- * Copyright (C) 2012 Lothar Felten <[email protected]>
+ * Copyright (C) 2012 Lothar Felten <[email protected]>
  * Thanks to Jan Volkering
  *
  * This program is free software; you can redistribute it and/or modify

@@ -329,6 +329,15 @@ static int ina2xx_set_shunt(struct ina2xx_data *data, long val)
 	return 0;
 }
 
+static ssize_t ina2xx_show_shunt(struct device *dev,
+			      struct device_attribute *da,
+			      char *buf)
+{
+	struct ina2xx_data *data = dev_get_drvdata(dev);
+
+	return snprintf(buf, PAGE_SIZE, "%li\n", data->rshunt);
+}
+
 static ssize_t ina2xx_store_shunt(struct device *dev,
 				  struct device_attribute *da,
 				  const char *buf, size_t count)

@@ -403,7 +412,7 @@ static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, ina2xx_show_value, NULL,
 
 /* shunt resistance */
 static SENSOR_DEVICE_ATTR(shunt_resistor, S_IRUGO | S_IWUSR,
-			  ina2xx_show_value, ina2xx_store_shunt,
+			  ina2xx_show_shunt, ina2xx_store_shunt,
 			  INA2XX_CALIBRATION);
 
 /* update interval (ina226 only) */
include/linux/platform_data/ina2xx.h +1 -1
index 9abc0ca7259b..9f0aa1b48c78 100644
@@ -1,7 +1,7 @@
 /*
  * Driver for Texas Instruments INA219, INA226 power monitor chips
  *
- * Copyright (C) 2012 Lothar Felten <[email protected]>
+ * Copyright (C) 2012 Lothar Felten <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
Signature · 1 line
2.11.0
maintainer Applied
#1 lore raw
Quoted 6 lines · Lothar Felten

fix the sysfs shunt resistor read access: return the shunt resistor value, not the calibration register contents.

update email address

Signed-off-by Lothar Felten <[email protected]>

Applied.

Thanks,
Guenter