Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933007AbcDTOiZ (ORCPT ); Wed, 20 Apr 2016 10:38:25 -0400 Received: from lists.s-osg.org ([54.187.51.154]:50938 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752893AbcDTOiX (ORCPT ); Wed, 20 Apr 2016 10:38:23 -0400 From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , linux-samsung-soc@vger.kernel.org, Krzysztof Kozlowski , Wolfram Sang , Kukjin Kim , linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/2] i2c: s3c2410: Check clk_prepare_enable() return value Date: Wed, 20 Apr 2016 10:37:56 -0400 Message-Id: <1461163076-5959-2-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461163076-5959-1-git-send-email-javier@osg.samsung.com> References: <1461163076-5959-1-git-send-email-javier@osg.samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 986 Lines: 34 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 --- 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(-) 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) { -- 2.5.5