Skip to contentSkip to conversation

Patch "hwmon: (ntc_thermistor) Ensure iio channel is of type IIO_VOLTAGE" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message Jun 3, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

hwmon: (ntc_thermistor) Ensure iio channel is of type IIO_VOLTAGE

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
hwmon-ntc_thermistor-ensure-iio-channel-is-of-type-iio_voltage.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From adba657533bdd255f7b78bc8a324091f46b294cd Mon Sep 17 00:00:00 2001

From: Chris Lesiak <[email protected]>
Date: Tue, 26 May 2015 15:40:44 -0500
Subject: hwmon: (ntc_thermistor) Ensure iio channel is of type IIO_VOLTAGE

From: Chris Lesiak <[email protected]>

commit adba657533bdd255f7b78bc8a324091f46b294cd upstream.

When configured via device tree, the associated iio device needs to be measuring voltage for the conversion to resistance to be correct. Return -EINVAL if that is not the case.

---
 drivers/hwmon/ntc_thermistor.c |    9 +++++++++
 1 file changed, 9 insertions(+)
drivers/hwmon/ntc_thermistor.c +9 -0
@@ -239,8 +239,10 @@ static struct ntc_thermistor_platform_da
 ntc_thermistor_parse_dt(struct platform_device *pdev)
 {
 	struct iio_channel *chan;
+	enum iio_chan_type type;
 	struct device_node *np = pdev->dev.of_node;
 	struct ntc_thermistor_platform_data *pdata;
+	int ret;
 
 	if (!np)
 		return NULL;
@@ -253,6 +255,13 @@ ntc_thermistor_parse_dt(struct platform_
 	if (IS_ERR(chan))
 		return ERR_CAST(chan);
 
+	ret = iio_get_channel_type(chan, &type);
+	if (ret < 0)
+		return ERR_PTR(ret);
+
+	if (type != IIO_VOLTAGE)
+		return ERR_PTR(-EINVAL);
+
 	if (of_property_read_u32(np, "pullup-uv", &pdata->pullup_uv))
 		return ERR_PTR(-ENODEV);
 	if (of_property_read_u32(np, "pullup-ohm", &pdata->pullup_ohm))

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/hwmon-ntc_thermistor-ensure-iio-channel-is-of-type-iio_voltage.patch