From patchwork Mon May 13 21:18:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Baatz X-Patchwork-Id: 2560691 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 693813FD4E for ; Mon, 13 May 2013 21:19:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754074Ab3EMVTt (ORCPT ); Mon, 13 May 2013 17:19:49 -0400 Received: from mo-p00-ob.rzone.de ([81.169.146.162]:13020 "EHLO mo-p00-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752912Ab3EMVTt (ORCPT ); Mon, 13 May 2013 17:19:49 -0400 X-RZG-AUTH: :L20Qdkipd/NtQfa28f3iP6nsj1VEm6lxnnjU56eNUnjyVKhsqhnPYh2bEHIh+4rflDg= X-RZG-CLASS-ID: mo00 Received: from gandalf.schnuecks.de (p5DE8E559.dip0.t-ipconnect.de [93.232.229.89]) by smtp.strato.de (joses mo46) (RZmta 31.27 DYNA|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id D0181dp4DLHZFX ; Mon, 13 May 2013 23:19:48 +0200 (CEST) Received: by gandalf.schnuecks.de (Postfix, from userid 500) id EA4DF4014B; Mon, 13 May 2013 23:19:47 +0200 (CEST) From: Simon Baatz To: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: Jason Cooper , Andrew Lunn , Chris Ball , Guennadi Liakhovetski , Thomas Petazzoni Subject: [PATCH V2 04/10] mmc: mxcmmc: handle mmc_of_parse() errors during probe Date: Mon, 13 May 2013 23:18:55 +0200 Message-Id: <1368479941-10084-5-git-send-email-gmbnomis@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1368479941-10084-1-git-send-email-gmbnomis@gmail.com> References: <1368479941-10084-1-git-send-email-gmbnomis@gmail.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Signed-off-by: Simon Baatz --- drivers/mmc/host/mxcmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index d503635..f47546f 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -1067,7 +1067,9 @@ static int mxcmci_probe(struct platform_device *pdev) goto out_release_mem; } - mmc_of_parse(mmc); + ret = mmc_of_parse(mmc); + if (ret) + goto out_free; mmc->ops = &mxcmci_ops; /* For devicetree parsing, the bus width is read from devicetree */