From patchwork Thu Dec 18 09:41:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5512161 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E4CE8BEEA8 for ; Thu, 18 Dec 2014 09:42:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98AD720A14 for ; Thu, 18 Dec 2014 09:42:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E13220A22 for ; Thu, 18 Dec 2014 09:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750983AbaLRJmG (ORCPT ); Thu, 18 Dec 2014 04:42:06 -0500 Received: from mail-wi0-f181.google.com ([209.85.212.181]:63987 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751751AbaLRJmD (ORCPT ); Thu, 18 Dec 2014 04:42:03 -0500 Received: by mail-wi0-f181.google.com with SMTP id r20so1122064wiv.8 for ; Thu, 18 Dec 2014 01:42:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7TQO3ASmaidZucc0+FntNXbYlQJLuTnPqhXqwMTnriU=; b=jqYh/+4nbNba4i5TZdaQJJD6ExNoSBNg6B9nZox0pSKq0wM3d8HKcAooqzWSGO8l9C 0Ls03ZiUGNE5uTh3/7hj6Zjm/eukpAZ4li2ABw87c7KxDaXfkTFYFLt4CvGhoR0Wi3v9 gNrHfg9ThorPpijHicYxru4ecvcE1C5QRrHzx9vYzio9U5dbgt1sBNvHQLwqflUON1iD YbuWfOjKNNt640ikfGSSQsWheFnmgXOYl7XYo9W2AGYdDPWUVSbQbxa5B6qk6fxDfZvu goBR2ryornJHdn1dSN2bwSb9ghdvIthzhHCWy4ukDRsps6UfV6NFduFsUcZRx8po1r+/ DHBw== X-Gm-Message-State: ALoCoQn8HVma2hdvQg/6si2R02M2vOZhMcn6HZkcZm6+UyGaHcKMqR+mV5DUmmxGChLYY3ri70YJ X-Received: by 10.194.88.131 with SMTP id bg3mr2231292wjb.99.1418895722525; Thu, 18 Dec 2014 01:42:02 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id w10sm8256264wje.10.2014.12.18.01.42.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Dec 2014 01:42:01 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Cc: Srinivas Kandagatla , Maxime Coquelin , Patrice Chotard Subject: [PATCH 5/6] mmc: sdhci-st: Do cleanup while mmc_of_parse() return an error Date: Thu, 18 Dec 2014 10:41:43 +0100 Message-Id: <1418895704-25908-6-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418895704-25908-1-git-send-email-ulf.hansson@linaro.org> References: <1418895704-25908-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 At errors, balance sdhci_pltfm_init() with sdhci_pltfm_free(), to make sure all data is freed properly. Cc: Srinivas Kandagatla Cc: Maxime Coquelin Cc: Patrice Chotard Signed-off-by: Ulf Hansson Acked-by: Maxime Coquelin --- drivers/mmc/host/sdhci-st.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c index 328f348..882b07e 100644 --- a/drivers/mmc/host/sdhci-st.c +++ b/drivers/mmc/host/sdhci-st.c @@ -78,10 +78,9 @@ static int sdhci_st_probe(struct platform_device *pdev) } ret = mmc_of_parse(host->mmc); - if (ret) { dev_err(&pdev->dev, "Failed mmc_of_parse\n"); - return ret; + goto err_of; } clk_prepare_enable(clk); @@ -108,6 +107,7 @@ static int sdhci_st_probe(struct platform_device *pdev) err_out: clk_disable_unprepare(clk); +err_of: sdhci_pltfm_free(pdev); return ret;