i2c: mux: demux-pinctrl: check initial mux selection, too

When misconfigured, the initial setup of the current mux channel can
fail, too. It must be checked as well.

Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index dce18f763a09ba5288ad2d70bef4c5f860e4cd06..b204e5a21ce6db0759dd37aa85d661471b7c93fc 100644 (file)
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -261,7 +261,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
        pm_runtime_no_callbacks(&pdev->dev);
 
        /* switch to first parent as active master */
-       i2c_demux_activate_master(priv, 0);
+       err = i2c_demux_activate_master(priv, 0);
+       if (err)
+               goto err_rollback;
 
        err = device_create_file(&pdev->dev, &dev_attr_available_masters);
        if (err)