]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
regulator: tps65910: fix a missing check of return value
authorKangjie Lu <kjlu@umn.edu>
Fri, 21 Dec 2018 06:29:19 +0000 (00:29 -0600)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:21:35 +0000 (14:21 -0300)
BugLink: https://bugs.launchpad.net/bugs/1855787
[ Upstream commit cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a ]

tps65910_reg_set_bits() may fail. The fix checks if it fails, and if so,
returns with its error code.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/regulator/tps65910-regulator.c

index 81672a58fcc234f381a40c3b43eda132a6dd96a5..194fa0cbbc048176bdf0e326269abed2b52043a6 100644 (file)
@@ -1102,8 +1102,10 @@ static int tps65910_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, pmic);
 
        /* Give control of all register to control port */
-       tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL,
+       err = tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL,
                                DEVCTRL_SR_CTL_I2C_SEL_MASK);
+       if (err < 0)
+               return err;
 
        switch (tps65910_chip_id(tps65910)) {
        case TPS65910: