From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754500AbbLINa5 (ORCPT ); Wed, 9 Dec 2015 08:30:57 -0500 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34435 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754447AbbLINay (ORCPT ); Wed, 9 Dec 2015 08:30:54 -0500 Subject: Re: [PATCH 3.16.y-ckt 059/126] thermal: exynos: Fix unbalanced regulator disable on probe failure To: Luis Henriques , linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com References: <1449653896-5236-1-git-send-email-luis.henriques@canonical.com> <1449653896-5236-60-git-send-email-luis.henriques@canonical.com> Cc: k.kozlowski.k@gmail.com, Eduardo Valentin From: Krzysztof Kozlowski Message-ID: <56682B1D.9090707@samsung.com> Date: Wed, 9 Dec 2015 22:22:37 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1449653896-5236-60-git-send-email-luis.henriques@canonical.com> Content-Type: text/plain; charset=iso-8859-2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org W dniu 09.12.2015 o 18:37, Luis Henriques pisze: > 3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Krzysztof Kozlowski > > commit 824ead03b78403a21449cb7eb153a4344cd3b4c8 upstream. > > During probe if the regulator could not be enabled, the error exit path > would still disable it. This could lead to unbalanced counter of > regulator enable/disable. > > The patch moves code for getting and enabling the regulator from > exynos_map_dt_data() to probe function because it is really not a part > of getting Device Tree properties. > > Acked-by: Lukasz Majewski > Tested-by: Lukasz Majewski > Reviewed-by: Alim Akhtar > Signed-off-by: Krzysztof Kozlowski > Fixes: 5f09a5cbd14a ("thermal: exynos: Disable the regulator on probe failure") > Signed-off-by: Eduardo Valentin > [ luis: backported to 3.16: adjusted context ] > Signed-off-by: Luis Henriques This patch shouldn't be backported before 4.2. It fixes a bug introduced in 4.2: 5f09a5cbd14a. For kernels <4.2 this bug does not exist but fortunately the patch looks harmless. Anyway still for <4.2 I think it shouldn't be ported. Best regards, Krzysztof > --- > drivers/thermal/samsung/exynos_tmu.c | 33 ++++++++++++++++----------------- > 1 file changed, 16 insertions(+), 17 deletions(-) > > diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c > index efed4eedf47f..bd3ba217386e 100644 > --- a/drivers/thermal/samsung/exynos_tmu.c > +++ b/drivers/thermal/samsung/exynos_tmu.c > @@ -558,27 +558,10 @@ static int exynos_map_dt_data(struct platform_device *pdev) > struct exynos_tmu_data *data = platform_get_drvdata(pdev); > struct exynos_tmu_platform_data *pdata; > struct resource res; > - int ret; > > if (!data || !pdev->dev.of_node) > return -ENODEV; > > - /* > - * Try enabling the regulator if found > - * TODO: Add regulator as an SOC feature, so that regulator enable > - * is a compulsory call. > - */ > - data->regulator = devm_regulator_get(&pdev->dev, "vtmu"); > - if (!IS_ERR(data->regulator)) { > - ret = regulator_enable(data->regulator); > - if (ret) { > - dev_err(&pdev->dev, "failed to enable vtmu\n"); > - return ret; > - } > - } else { > - dev_info(&pdev->dev, "Regulator node (vtmu) not found\n"); > - } > - > data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl"); > if (data->id < 0) > data->id = 0; > @@ -643,6 +626,22 @@ static int exynos_tmu_probe(struct platform_device *pdev) > platform_set_drvdata(pdev, data); > mutex_init(&data->lock); > > + /* > + * Try enabling the regulator if found > + * TODO: Add regulator as an SOC feature, so that regulator enable > + * is a compulsory call. > + */ > + data->regulator = devm_regulator_get(&pdev->dev, "vtmu"); > + if (!IS_ERR(data->regulator)) { > + ret = regulator_enable(data->regulator); > + if (ret) { > + dev_err(&pdev->dev, "failed to enable vtmu\n"); > + return ret; > + } > + } else { > + dev_info(&pdev->dev, "Regulator node (vtmu) not found\n"); > + } > + > ret = exynos_map_dt_data(pdev); > if (ret) > return ret; > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >