summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-06-06 17:59:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-13 11:07:32 +0200
commitce046e5d9b489554c29ae9277cdc2f86dee76a84 (patch)
treefad95ebba112a8521d1752957b8cc2a1fc3ace7a
parentc592fafbdbb6b1279b76a54722d1465ca77e5bde (diff)
downloadlinux-ce046e5d9b489554c29ae9277cdc2f86dee76a84.tar.bz2
thermal: max77620: fix pinmux conflict on reprobe
Use the new helper for reusing a device-tree node of another device instead of managing the node references explicitly. This also makes sure that the new of_node_reuse flag is set if the device is ever reprobed, something which specifically now avoids driver core from attempting to claim any pinmux resources already claimed by the parent device. Fixes: ec4664b3fd6d ("thermal: max77620: Add thermal driver for reporting junction temp") Cc: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/thermal/max77620_thermal.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/thermal/max77620_thermal.c b/drivers/thermal/max77620_thermal.c
index 71d35f3c9215..159bbcee8821 100644
--- a/drivers/thermal/max77620_thermal.c
+++ b/drivers/thermal/max77620_thermal.c
@@ -112,12 +112,10 @@ static int max77620_thermal_probe(struct platform_device *pdev)
}
/*
- * Drop any current reference to a device-tree node and get a
- * reference to the parent's node which will be balanced on reprobe or
- * on platform-device release.
+ * The reference taken to the parent's node which will be balanced on
+ * reprobe or on platform-device release.
*/
- of_node_put(pdev->dev.of_node);
- pdev->dev.of_node = of_node_get(pdev->dev.parent->of_node);
+ device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent);
mtherm->tz_device = devm_thermal_zone_of_sensor_register(&pdev->dev, 0,
mtherm, &max77620_thermal_ops);