]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
regulator: qcom_spmi: Use correct regmap when checking for error
authorNiklas Cassel <niklas.cassel@linaro.org>
Mon, 16 Jul 2018 13:32:52 +0000 (15:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2018 06:39:28 +0000 (08:39 +0200)
[ Upstream commit 85046a15529606466bc778e1205f4cab8e3724d1 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/regulator/qcom_spmi-regulator.c

index 9817f1a753425e2199b0f3fda82ac15907ffc63a..8d5cd624b4b83d7e4ed56c651e4579dbd5997a7f 100644 (file)
@@ -1774,7 +1774,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");
        }