From patchwork Thu Dec 18 09:41:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 42407 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 975B526C6B for ; Thu, 18 Dec 2014 09:41:59 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id hs14sf495383lab.1 for ; Thu, 18 Dec 2014 01:41:58 -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=RZY+e327P8+PRPU58y3l522g1mFthinVJ5JmuAT+8lk=; b=Te1PMklSDxpNwLaCXgTWy91J2+yrElu+jQ4Eo33mlTNFdQ1QSGtydilKCkZydL8A7Q VDQNw0jsUn6z41HyJE4zWK7t+SMWVMtZ0AyMxp3sKG+D1bTl63asJnnaUC0c+2wNEroB f3OOi8iT32Ck+FJ84i5VrIncIOVsUbcincL0H/CmTfynHGyYzrMI79BucaouxwtQr6Kj LRafKBHe5NjhykiTBYQSBjZtlgaqm4fqPSZfdi7SbqTrW55YTp/0Q4rtTANqVAEGd/Dr s6/RPXkS/AEei8TYivNMZEqTeBjDSPQmHYfihKIOKBzENIOFWdVXstRXHJWK5e+b7StK uEsA== X-Gm-Message-State: ALoCoQnRkc5ioMxomUUlCPdIkJEajYb6ja5c1lZ3ui2/V0OzdaSgPuJcG7NVnHqjJWAjDmmjJzSf X-Received: by 10.194.173.97 with SMTP id bj1mr188914wjc.2.1418895718494; Thu, 18 Dec 2014 01:41:58 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.162 with SMTP id kr2ls1103951lac.36.gmail; Thu, 18 Dec 2014 01:41:58 -0800 (PST) X-Received: by 10.152.37.74 with SMTP id w10mr1178518laj.85.1418895718136; Thu, 18 Dec 2014 01:41:58 -0800 (PST) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id k1si6339990lam.30.2014.12.18.01.41.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Dec 2014 01:41:57 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id b6so636060lbj.36 for ; Thu, 18 Dec 2014 01:41:57 -0800 (PST) X-Received: by 10.112.135.229 with SMTP id pv5mr1260465lbb.52.1418895717848; Thu, 18 Dec 2014 01:41:57 -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 ru5csp1645866lbb; Thu, 18 Dec 2014 01:41:57 -0800 (PST) X-Received: by 10.194.62.76 with SMTP id w12mr2470492wjr.5.1418895717131; Thu, 18 Dec 2014 01:41:57 -0800 (PST) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com. [74.125.82.48]) by mx.google.com with ESMTPS id ep3si12654412wib.0.2014.12.18.01.41.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Dec 2014 01:41:57 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 74.125.82.48 as permitted sender) client-ip=74.125.82.48; Received: by mail-wg0-f48.google.com with SMTP id y19so1067144wgg.35 for ; Thu, 18 Dec 2014 01:41:56 -0800 (PST) X-Received: by 10.181.13.7 with SMTP id eu7mr3440234wid.72.1418895716679; Thu, 18 Dec 2014 01:41:56 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id w10sm8256264wje.10.2014.12.18.01.41.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Dec 2014 01:41:55 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Cc: Jonas Jensen Subject: [PATCH 1/6] mmc: moxart: Handle error from mmc_of_parse() Date: Thu, 18 Dec 2014 10:41:39 +0100 Message-Id: <1418895704-25908-2-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.217.177 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: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Since mmc_of_parse() may fail, let's deal with it and thus do proper error handling. Cc: Jonas Jensen Signed-off-by: Ulf Hansson --- drivers/mmc/host/moxart-mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c index f3e18d0..d2a1ef6 100644 --- a/drivers/mmc/host/moxart-mmc.c +++ b/drivers/mmc/host/moxart-mmc.c @@ -599,7 +599,9 @@ static int moxart_probe(struct platform_device *pdev) goto out; } - mmc_of_parse(mmc); + ret = mmc_of_parse(mmc); + if (ret) + goto out; dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask);