diff options
| author |   Baolin Wang <baolin.wang@linaro.org> | 2019-07-25 15:56:18 +0800 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2019-08-06 22:54:23 +0200 |
| commit | bbeb6b6c07960b8d33bed5352ef462228110c5ab (patch) | |
| tree | a65a33aa601a5aa6770861e6e3ccba90b1c53071 /drivers/i2c | |
| parent | i2c: sprd: Change to use devm_platform_ioremap_resource() (diff) | |
| download | linux-dev-bbeb6b6c07960b8d33bed5352ef462228110c5ab.tar.xz linux-dev-bbeb6b6c07960b8d33bed5352ef462228110c5ab.zip | |
i2c: sprd: Validate the return value of clock initialization
The 'enable' clock of I2C master is required, we should return an error
if failed to get the 'enable' clock, to make sure the I2C driver can be
defer probe if the clock resource is not ready.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sprd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c index bbcb0569522d..b432e7580458 100644 --- a/drivers/i2c/busses/i2c-sprd.c +++ b/drivers/i2c/busses/i2c-sprd.c @@ -466,9 +466,9 @@ static int sprd_i2c_clk_init(struct sprd_i2c *i2c_dev) i2c_dev->clk = devm_clk_get(i2c_dev->dev, "enable"); if (IS_ERR(i2c_dev->clk)) { - dev_warn(i2c_dev->dev, "i2c%d can't get the enable clock\n", - i2c_dev->adap.nr); - i2c_dev->clk = NULL; + dev_err(i2c_dev->dev, "i2c%d can't get the enable clock\n", + i2c_dev->adap.nr); + return PTR_ERR(i2c_dev->clk); } return 0; @@ -519,7 +519,10 @@ static int sprd_i2c_probe(struct platform_device *pdev) if (i2c_dev->bus_freq != 100000 && i2c_dev->bus_freq != 400000) return -EINVAL; - sprd_i2c_clk_init(i2c_dev); + ret = sprd_i2c_clk_init(i2c_dev); + if (ret) + return ret; + platform_set_drvdata(pdev, i2c_dev); ret = clk_prepare_enable(i2c_dev->clk); |