diff options
| author | Franklin S Cooper Jr <fcooper@ti.com> | 2017-08-16 17:17:13 -0500 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-08-27 15:34:09 +0200 |
| commit | cc209ac81cce0109e03af23f68ea06b549a4a2ed (patch) | |
| tree | adc2fb1f3dbdc5f015ac211c260bd97e57df7fab /drivers/i2c | |
| parent | 1304fe0916eeb67c78309e54eb819f8b4932ed33 (diff) | |
| download | linux-cc209ac81cce0109e03af23f68ea06b549a4a2ed.tar.gz linux-cc209ac81cce0109e03af23f68ea06b549a4a2ed.tar.bz2 linux-cc209ac81cce0109e03af23f68ea06b549a4a2ed.zip | |
i2c: davinci: Preserve return value of devm_clk_get
The i2c driver can run into driver dependency issues if its loaded
before a clock driver it depends on. Therefore, EPROBE_DEFER may be
returned by devm_clk_get and should be returned in probe to allow the
kernel to reprobe the driver at a later time. This patch allows the error
value returned by devm_clk_get to be passed through and not overwritten.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-davinci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 33ca9a336182..b8c43535f16c 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -801,7 +801,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) dev->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(dev->clk)) - return -ENODEV; + return PTR_ERR(dev->clk); clk_prepare_enable(dev->clk); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |