From patchwork Thu Dec 18 09:41:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5512141 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 4A676BEEBA for ; Thu, 18 Dec 2014 09:42:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8EB3F20A14 for ; Thu, 18 Dec 2014 09:42:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFFE920A22 for ; Thu, 18 Dec 2014 09:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751653AbaLRJmB (ORCPT ); Thu, 18 Dec 2014 04:42:01 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:39038 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751564AbaLRJmA (ORCPT ); Thu, 18 Dec 2014 04:42:00 -0500 Received: by mail-wi0-f177.google.com with SMTP id l15so1140238wiw.4 for ; Thu, 18 Dec 2014 01:41:59 -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:subject:date:message-id:in-reply-to :references; bh=UNFjfhegIe/HAGEguhtOfMILsuYpp/ZB09HCBM0lqUM=; b=Mysx08YYTR471JAAX9LsuAX/E0Cy6LP51UTHKoCzjMocRbriK93Q/+aOe5pPSvOqOh y5FsQrl90WCPJ3St37MAIJH2htO7wDvg1/uSKnsi/IyaYBZQcMsrqeqI+tyiOo9tRsh5 iwkF3N+vuDwHELUYDDuuu86+CZ0ix6jQekrIRmBhPi2ThWPCDXOg8jAV+I1yob+WYBTH o/VCDSfJByfy2Lb0Dpf+nP8CWI8CqqL8rQzXZmcRTwUr4kYYmsPF0KR70jERpmO5zDvx m/hIsOitLMyv9ESOmxCqKjrs6Qr2cYjyhFdY0V2TKxv//0b5/uqoGzlAKKqAkIyB2ecG YuDQ== X-Gm-Message-State: ALoCoQnss09DDbjEZgkFpRBRryZaCqAHMRyf4ECcamIrLgkT3Czv4DlOk7fbmNI+31hjlWjoAF3j X-Received: by 10.194.238.3 with SMTP id vg3mr2305649wjc.69.1418895719625; Thu, 18 Dec 2014 01:41:59 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id w10sm8256264wje.10.2014.12.18.01.41.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Dec 2014 01:41:59 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Subject: [PATCH 3/6] mmc: sdhci-of-esdhc: Handle error from mmc_of_parse() Date: Thu, 18 Dec 2014 10:41:41 +0100 Message-Id: <1418895704-25908-4-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. Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-of-esdhc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 8872c85..429bf41 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -362,13 +362,19 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) } /* call to generic mmc_of_parse to support additional capabilities */ - mmc_of_parse(host->mmc); + ret = mmc_of_parse(host->mmc); + if (ret) + goto err; + mmc_of_parse_voltage(np, &host->ocr_mask); ret = sdhci_add_host(host); if (ret) - sdhci_pltfm_free(pdev); + goto err; + return 0; + err: + sdhci_pltfm_free(pdev); return ret; }