| Message ID | 1461163076-5959-2-git-send-email-javier@osg.samsung.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 04/20/2016 04:37 PM, Javier Martinez Canillas wrote: > The clk_prepare_enable() function can fail so check the return > value and propagate the error in case of a failure. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > > --- > > Changes in v2: > - Don't print the errno code since that's already printed by the > core when probe fails. Suggested by Krzysztof Kozlowski. > > drivers/i2c/busses/i2c-s3c2410.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Tested on Trats2 (Exynos4412, samsung,s3c2440-i2c) Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 20, 2016 at 10:37:56AM -0400, Javier Martinez Canillas wrote: > The clk_prepare_enable() function can fail so check the return > value and propagate the error in case of a failure. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 13f67df65c45..8a9ea0c1e41d 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1196,7 +1196,12 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) /* initialise the i2c controller */ - clk_prepare_enable(i2c->clk); + ret = clk_prepare_enable(i2c->clk); + if (ret) { + dev_err(&pdev->dev, "I2C clock enable failed\n"); + return ret; + } + ret = s3c24xx_i2c_init(i2c); clk_disable(i2c->clk); if (ret != 0) {
The clk_prepare_enable() function can fail so check the return value and propagate the error in case of a failure. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- Changes in v2: - Don't print the errno code since that's already printed by the core when probe fails. Suggested by Krzysztof Kozlowski. drivers/i2c/busses/i2c-s3c2410.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)