diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-12 14:02:54 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-12 14:02:54 +0200 |
| commit | 0021a0c8a58ff37f62f4d2424dca7c6a6d9f233d (patch) | |
| tree | 2dd57ed085b1fdf17f9e79e963f1d02051bc76d3 /drivers/i2c | |
| parent | 5b3083e6d7a98e4afec861060537004772dc4acf (diff) | |
| parent | 712fcc850e5a6d0867b0d97a0b79f1addd01998f (diff) | |
Merge remote-tracking branch 'fscl/5.4-2.3.x-imx' into toradex_5.4-2.3.x-imx-v5.4.161
Conflicts:
drivers/net/phy/micrel.c
drivers/usb/chipidea/core.c
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-xlr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-xlr.c b/drivers/i2c/busses/i2c-xlr.c index 34cd4b308540..dda6cb848405 100644 --- a/drivers/i2c/busses/i2c-xlr.c +++ b/drivers/i2c/busses/i2c-xlr.c @@ -433,11 +433,15 @@ static int xlr_i2c_probe(struct platform_device *pdev) i2c_set_adapdata(&priv->adap, priv); ret = i2c_add_numbered_adapter(&priv->adap); if (ret < 0) - return ret; + goto err_unprepare_clk; platform_set_drvdata(pdev, priv); dev_info(&priv->adap.dev, "Added I2C Bus.\n"); return 0; + +err_unprepare_clk: + clk_unprepare(clk); + return ret; } static int xlr_i2c_remove(struct platform_device *pdev) |