lkml.org 
[lkml]   [2017]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 7/7] thermal: max77620: fix pinmux conflict on reprobe
On Tue, May 30, 2017 at 06:25:54PM +0200, Johan Hovold wrote:
> 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>
> ---
> drivers/thermal/max77620_thermal.c | 8 +++-----
> 1 file 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);

Should this one be squashed with patch 6/7?

>
> mtherm->tz_device = devm_thermal_zone_of_sensor_register(&pdev->dev, 0,
> mtherm, &max77620_thermal_ops);
> --
> 2.13.0
>
>

--
All the best,
Eduardo Valentin

\
 
 \ /
  Last update: 2017-05-30 20:57    [W:0.166 / U:0.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site