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: 5512121 Return-Path: X-Original-To: patchwork-linux-mmc@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 9268F9F8B4 for ; Thu, 18 Dec 2014 09:42:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0C1520A14 for ; Thu, 18 Dec 2014 09:42:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02F9520A22 for ; Thu, 18 Dec 2014 09:41:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751644AbaLRJl6 (ORCPT ); Thu, 18 Dec 2014 04:41:58 -0500 Received: from mail-wi0-f176.google.com ([209.85.212.176]:46425 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983AbaLRJl6 (ORCPT ); Thu, 18 Dec 2014 04:41:58 -0500 Received: by mail-wi0-f176.google.com with SMTP id ex7so1118174wid.3 for ; Thu, 18 Dec 2014 01:41:56 -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=RZY+e327P8+PRPU58y3l522g1mFthinVJ5JmuAT+8lk=; b=Uigh4xHyK4OtZrBbKocebbohpUUpH1Fwo3QXO2GSeiXr+klI0Tgfi7dzozIrybqEZe mI40OKIQJWmv1BFF9Qsi2GQ3KRIq4jsmf9kkLgUD5Y1xewCp0rwVhV/GwOdMtGrSCa+a CvXfRm4ZwUcVfEGvdMm3W4pCtGJT7/tIn8Dzx8Qoef+s75dtd7OIfuPzMtl6bCUzdCly wTtfkSuLtf/cipVT8jP/nYuidTo38mb7HPWXRfXTZvIOJL81WjkLREzv8cTxFybLXtKO 8ibhwp2P4wnC0PwIA2GzRjVt6Usjf/ixLRiwHsQs/Fuvh+IkiD2faHrsJm4hm/tRW76l 7jPw== X-Gm-Message-State: ALoCoQl0jcP96VSFn4n8IAcm3ejOw3VUvM+mccMJQN7Lzn54Gtx0VeDih3koPvfi5SmRu+8ENKpk 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> 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 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);