]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
i2c: rcar: fix error code in probe()
authorDan Carpenter <dan.carpenter@linaro.org>
Wed, 27 Sep 2023 12:38:36 +0000 (15:38 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Jul 2024 11:21:27 +0000 (13:21 +0200)
commit 37a672be3ae357a0f87fbc00897fa7fcb3d7d782 upstream.

Return an error code if devm_reset_control_get_exclusive() fails.
The current code returns success.

Fixes: 0e864b552b23 ("i2c: rcar: reset controller is mandatory for Gen3+")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/i2c/busses/i2c-rcar.c

index 1d341bd2b4b96d4085322bec37ef29ef1a3cb45b..84fdd3f5cc8445589367fb47d251ef297af9d3e6 100644 (file)
@@ -1121,8 +1121,10 @@ static int rcar_i2c_probe(struct platform_device *pdev)
        /* R-Car Gen3+ needs a reset before every transfer */
        if (priv->devtype >= I2C_RCAR_GEN3) {
                priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
-               if (IS_ERR(priv->rstc))
+               if (IS_ERR(priv->rstc)) {
+                       ret = PTR_ERR(priv->rstc);
                        goto out_pm_put;
+               }
 
                ret = reset_control_status(priv->rstc);
                if (ret < 0)