Skip to content

Commit

Permalink
thermal: max77620: fix pinmux conflict on reprobe
Browse files Browse the repository at this point in the history
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: ec4664b ("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>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Jun 13, 2017
1 parent c592faf commit ce046e5
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/thermal/max77620_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit ce046e5

Please sign in to comment.