lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectApplied "regulator: qcom_spmi: Use correct regmap when checking for error" to the regulator tree
    Date
    The patch

    regulator: qcom_spmi: Use correct regmap when checking for error

    has been applied to the regulator tree at

    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git

    All being well this means that it will be integrated into the linux-next
    tree (usually sometime in the next 24 hours) and sent to Linus during
    the next merge window (or sooner if it is a bug fix), however if
    problems are discovered then the patch may be dropped or reverted.

    You may get further e-mails resulting from automated or manual testing
    and review of the tree, please engage with people reporting problems and
    send followup patches addressing any issues that are reported if needed.

    If any updates are required or you are submitting further changes they
    should be sent as incremental updates against current git, existing
    patches will not be replaced.

    Please add any relevant lists and maintainers to the CCs when replying
    to this mail.

    Thanks,
    Mark

    From 85046a15529606466bc778e1205f4cab8e3724d1 Mon Sep 17 00:00:00 2001
    From: Niklas Cassel <niklas.cassel@linaro.org>
    Date: Mon, 16 Jul 2018 15:32:52 +0200
    Subject: [PATCH] regulator: qcom_spmi: Use correct regmap when checking for
    error

    Since we have just assigned saw_regmap, and since the error message
    refers to saw_regmap, it feels safe to assume that it is saw_regmap,
    and not regmap, that should be checked for errors.

    Fixes: 0caecaa87202 ("regulator: qcom_spmi: Add support for SAW")
    Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    ---
    drivers/regulator/qcom_spmi-regulator.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
    index 4cc14c65d86b..ba3d5e63ada6 100644
    --- a/drivers/regulator/qcom_spmi-regulator.c
    +++ b/drivers/regulator/qcom_spmi-regulator.c
    @@ -1775,7 +1775,7 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev)
    syscon = of_parse_phandle(node, "qcom,saw-reg", 0);
    saw_regmap = syscon_node_to_regmap(syscon);
    of_node_put(syscon);
    - if (IS_ERR(regmap))
    + if (IS_ERR(saw_regmap))
    dev_err(dev, "ERROR reading SAW regmap\n");
    }

    --
    2.18.0
    \
     
     \ /
      Last update: 2018-07-20 18:46    [W:4.366 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site