| Message ID | 1418895704-25908-5-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBDF57NG2XIHRB4GCZKSAKGQEVIQQIII@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AD2C726C6B for <linaro@patches.linaro.org>; Thu, 18 Dec 2014 09:42:09 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id r20sf434260wiv.5 for <linaro@patches.linaro.org>; Thu, 18 Dec 2014 01:42:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=VmO0tVV+4+jFXO46vNZYfjXb9XOkjHVLhv6cQlPIs2Q=; b=jUnJO+2u/o/jacfaXQREO8lF0Cv6bzI9RYf1H1AS7pfZvSeHwJxrJ8SP2woCHWmDSp k/d9Zfp9ggHJAXyf2eg5oBpBI7vuz/UjeBKNYBLep3Ke3aSpGlAPuE55f9csP3cLtskY 26TwCETLK6uLQNxtkyJj5SOjdNvb2CqHXKl47cIx4ss82TrFTjBia94iRwtLZSYsaqyf grOpvexzXoUcTiY49N+rqpWEiU4K8YdYCdMHQPM2IdraSisFpWl+Xb+mkYtE++CO1Skd 7j2Z36bO2ikVYKu5RefCgvuruKhbTKJLaaCk3RSMpl16YsJP/ChPbZjZBeInotb6YKkl s8dA== X-Gm-Message-State: ALoCoQmsNSRe/obt/TQo78qWphpLDn3Pcc4JHGEhr4B6KF8Dh/LImHrS1nSmcftWYlTkJw7f/bpb X-Received: by 10.112.9.199 with SMTP id c7mr184557lbb.7.1418895728966; Thu, 18 Dec 2014 01:42:08 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.67 with SMTP id z3ls929925lag.2.gmail; Thu, 18 Dec 2014 01:42:08 -0800 (PST) X-Received: by 10.112.78.39 with SMTP id y7mr1303861lbw.42.1418895728530; Thu, 18 Dec 2014 01:42:08 -0800 (PST) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id h2si6267895lbd.101.2014.12.18.01.42.08 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Dec 2014 01:42:08 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id hz20so669515lab.34 for <patchwork-forward@linaro.org>; Thu, 18 Dec 2014 01:42:08 -0800 (PST) X-Received: by 10.112.235.137 with SMTP id um9mr1203601lbc.41.1418895728438; Thu, 18 Dec 2014 01:42:08 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.142.69 with SMTP id ru5csp1645915lbb; Thu, 18 Dec 2014 01:42:07 -0800 (PST) X-Received: by 10.194.77.142 with SMTP id s14mr2584263wjw.94.1418895722508; Thu, 18 Dec 2014 01:42:02 -0800 (PST) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com. [74.125.82.50]) by mx.google.com with ESMTPS id gf3si10903195wjd.151.2014.12.18.01.42.02 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Dec 2014 01:42:02 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 74.125.82.50 as permitted sender) client-ip=74.125.82.50; Received: by mail-wg0-f50.google.com with SMTP id a1so1068281wgh.37 for <patches@linaro.org>; Thu, 18 Dec 2014 01:42:02 -0800 (PST) X-Received: by 10.194.179.166 with SMTP id dh6mr2348858wjc.87.1418895721028; Thu, 18 Dec 2014 01:42:01 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id w10sm8256264wje.10.2014.12.18.01.41.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Dec 2014 01:42:00 -0800 (PST) From: Ulf Hansson <ulf.hansson@linaro.org> To: linux-mmc@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>, Chris Ball <chris@printf.net> Cc: Jaehoon Chung <jh80.chung@samsung.com> Subject: [PATCH 4/6] mmc: sdhci-s3c: Handle error from mmc_of_parse() Date: Thu, 18 Dec 2014 10:41:42 +0100 Message-Id: <1418895704-25908-5-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> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index c45b893..a282822 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -607,7 +607,9 @@ static int sdhci_s3c_probe(struct platform_device *pdev) pm_runtime_use_autosuspend(&pdev->dev); pm_suspend_ignore_children(&pdev->dev, 1); - mmc_of_parse(host->mmc); + ret = mmc_of_parse(host->mmc); + if (ret) + goto err_req_regs; ret = sdhci_add_host(host); if (ret) {
Since mmc_of_parse() may fail, let's deal with it and thus do proper error handling. Cc: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/mmc/host/sdhci-s3c.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)