mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: ec4664b3fd ("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>
This commit is contained in:
Johan Hovold 2017-06-06 17:59:04 +02:00 committed by Greg Kroah-Hartman
parent c592fafbdb
commit ce046e5d9b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/thermal/max77620_thermal.c
View File

@ -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);