From patchwork Wed Jun 26 09:35:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 2788331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2F81C9F3A0 for ; Wed, 26 Jun 2013 20:56:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52B3C200F7 for ; Wed, 26 Jun 2013 20:56:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D076D200D7 for ; Wed, 26 Jun 2013 20:56:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrszT-00023n-Nb; Wed, 26 Jun 2013 16:54:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ursxt-0000Pg-7R; Wed, 26 Jun 2013 16:53:05 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Urs2H-0005IC-66 for linux-arm-kernel@merlin.infradead.org; Wed, 26 Jun 2013 15:53:33 +0000 Received: from mail-db9lp0252.outbound.messaging.microsoft.com ([213.199.154.252] helo=db9outboundpool.messaging.microsoft.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrmXf-0005bn-Of for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2013 10:01:38 +0000 Received: from mail50-db9-R.bigfish.com (10.174.16.237) by DB9EHSOBE012.bigfish.com (10.174.14.75) with Microsoft SMTP Server id 14.1.225.23; Wed, 26 Jun 2013 10:00:59 +0000 Received: from mail50-db9 (localhost [127.0.0.1]) by mail50-db9-R.bigfish.com (Postfix) with ESMTP id 90F84C01EC; Wed, 26 Jun 2013 10:00:59 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zzzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6h1082kzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e23h1155h) Received: from mail50-db9 (localhost.localdomain [127.0.0.1]) by mail50-db9 (MessageSwitch) id 1372240858113626_23157; Wed, 26 Jun 2013 10:00:58 +0000 (UTC) Received: from DB9EHSMHS032.bigfish.com (unknown [10.174.16.238]) by mail50-db9.bigfish.com (Postfix) with ESMTP id 15BC92C0243; Wed, 26 Jun 2013 10:00:58 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB9EHSMHS032.bigfish.com (10.174.14.42) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 26 Jun 2013 10:00:58 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.328.11; Wed, 26 Jun 2013 10:00:56 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r5QA0ojA032440; Wed, 26 Jun 2013 03:00:54 -0700 From: Huang Shijie To: Subject: [PATCH 2/2] serial: imx: check the return value when enabling the clocks Date: Wed, 26 Jun 2013 17:35:59 +0800 Message-ID: <1372239359-4054-2-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372239359-4054-1-git-send-email-b32955@freescale.com> References: <1372239359-4054-1-git-send-email-b32955@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130626_030137_442373_66D09ED6 X-CRM114-Status: GOOD ( 12.24 ) X-Spam-Score: 0.0 (/) Cc: fabio.estevam@freescale.com, Huang Shijie , shawn.guo@linaro.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the probe function, we do not check the return value of the clk_prepare_enable(). But in actually, the clk_prepare_enable() may fails, so check the return value when we enable the clocks. Signed-off-by: Huang Shijie --- drivers/tty/serial/imx.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index bfdf764..2aec568 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1593,8 +1593,15 @@ static int serial_imx_probe(struct platform_device *pdev) return ret; } - clk_prepare_enable(sport->clk_per); - clk_prepare_enable(sport->clk_ipg); + ret = clk_prepare_enable(sport->clk_per); + if (ret) + return ret; + + ret = clk_prepare_enable(sport->clk_ipg); + if (ret) { + clk_disable_unprepare(sport->clk_per); + return ret; + } sport->port.uartclk = clk_get_rate(sport->clk_per);