Message ID | 1461096641-19788-2-git-send-email-javier@osg.samsung.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On 04/19/2016 10:10 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> > > --- > > drivers/i2c/busses/i2c-s3c2410.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c > index 4b873fe9a75b..cb40a3af46e7 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 (%d)\n", ret); Just: "I2C clock enable failed\n" The probe error code will be printed anyway. 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
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 4b873fe9a75b..cb40a3af46e7 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 (%d)\n", ret); + 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> --- drivers/i2c/busses/i2c-s3c2410.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)