From patchwork Sun Jul 21 16:25:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 260531 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2D0032C00C0 for ; Mon, 22 Jul 2013 02:25:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755888Ab3GUQZl (ORCPT ); Sun, 21 Jul 2013 12:25:41 -0400 Received: from mail-yh0-f43.google.com ([209.85.213.43]:34305 "EHLO mail-yh0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755722Ab3GUQZk (ORCPT ); Sun, 21 Jul 2013 12:25:40 -0400 Received: by mail-yh0-f43.google.com with SMTP id b12so2173821yha.16 for ; Sun, 21 Jul 2013 09:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vpZQnu75DcpjIySwNGV0zbgig4NLsokACokeU15tDq4=; b=w4Yq98yQVYGAF9s3yn/mCxJaHXag39SjwfOFWQ9vD+iYqlgqcPx2+VEfMkidL49XAY rl/htQ+/vB6sONBHa+brpGezc+C7cTNSYEFI6FJIeEt6s4zjcTvQ9lDwYk9zHpMTCIqZ bfPU6lIS3Rht4v860q+p4EfDaQjK13/vrw0jwjztp/vPc0kJKJq3/Kzxueh6PZOoD/6B L/NlcuX287gkU7TULG6oVkMKCezKKg1DtFiqpbh2CYIoylJgdPE9gcyRf7l+EIM1FeUA vOMHc/7/PVUSOTqLaqOzlW40d44ouHhD1BLhHjVGtMwZIU29hW5rcLLNJCalXoilxca4 SCaA== X-Received: by 10.236.53.129 with SMTP id g1mr12038751yhc.258.1374423939939; Sun, 21 Jul 2013 09:25:39 -0700 (PDT) Received: from localhost.localdomain ([189.5.19.145]) by mx.google.com with ESMTPSA id i27sm34053395yhj.24.2013.07.21.09.25.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Jul 2013 09:25:39 -0700 (PDT) From: Fabio Estevam To: davem@davemloft.net Cc: kernel@pengutronix.de, Frank.Li@freescale.com, shawn.guo@linaro.org, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH 4/6] fec: Check the return value from clk_prepare_enable() Date: Sun, 21 Jul 2013 13:25:02 -0300 Message-Id: <1374423904-2668-5-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374423904-2668-1-git-send-email-festevam@gmail.com> References: <1374423904-2668-1-git-send-email-festevam@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Fabio Estevam clk_prepare_enable() may fail, so let's check its return value and propagate it in the case of error. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec_main.c | 66 +++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 886a372..acc1850 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2103,12 +2103,25 @@ fec_probe(struct platform_device *pdev) fep->bufdesc_ex = 0; } - clk_prepare_enable(fep->clk_ahb); - clk_prepare_enable(fep->clk_ipg); - if (fep->clk_enet_out) - clk_prepare_enable(fep->clk_enet_out); - if (fep->clk_ptp) - clk_prepare_enable(fep->clk_ptp); + ret = clk_prepare_enable(fep->clk_ahb); + if (ret) + goto failed_clk; + + ret = clk_prepare_enable(fep->clk_ipg); + if (ret) + goto failed_clk_ipg; + + if (fep->clk_enet_out) { + ret = clk_prepare_enable(fep->clk_enet_out); + if (ret) + goto failed_clk_enet_out; + } + + if (fep->clk_ptp) { + ret = clk_prepare_enable(fep->clk_ptp); + if (ret) + goto failed_clk_ptp; + } fep->reg_phy = devm_regulator_get(&pdev->dev, "phy"); if (!IS_ERR(fep->reg_phy)) { @@ -2181,9 +2194,12 @@ failed_init: failed_regulator: if (fep->clk_ptp) clk_disable_unprepare(fep->clk_ptp); +failed_clk_ptp: if (fep->clk_enet_out) clk_disable_unprepare(fep->clk_enet_out); +failed_clk_enet_out: clk_disable_unprepare(fep->clk_ipg); +failed_clk_ipg: clk_disable_unprepare(fep->clk_ahb); failed_clk: failed_ioremap: @@ -2260,18 +2276,44 @@ fec_resume(struct device *dev) return ret; } - clk_prepare_enable(fep->clk_ahb); - clk_prepare_enable(fep->clk_ipg); - if (fep->clk_enet_out) - clk_prepare_enable(fep->clk_enet_out); - if (fep->clk_ptp) - clk_prepare_enable(fep->clk_ptp); + ret = clk_prepare_enable(fep->clk_ahb); + if (ret) + goto failed_clk_ahb; + + ret = clk_prepare_enable(fep->clk_ipg); + if (ret) + goto failed_clk_ipg; + + if (fep->clk_enet_out) { + ret = clk_prepare_enable(fep->clk_enet_out); + if (ret) + goto failed_clk_enet_out; + } + + if (fep->clk_ptp) { + ret = clk_prepare_enable(fep->clk_ptp); + if (ret) + goto failed_clk_ptp; + } + if (netif_running(ndev)) { fec_restart(ndev, fep->full_duplex); netif_device_attach(ndev); } return 0; + +failed_clk_ptp: + if (fep->clk_enet_out) + clk_disable_unprepare(fep->clk_enet_out); +failed_clk_enet_out: + clk_disable_unprepare(fep->clk_ipg); +failed_clk_ipg: + clk_disable_unprepare(fep->clk_ahb); +failed_clk_ahb: + if (fep->reg_phy) + regulator_disable(fep->reg_phy); + return ret; } #endif /* CONFIG_PM_SLEEP */