From patchwork Thu Dec 18 09:41:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5512131 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 B6FD3BEEA8 for ; Thu, 18 Dec 2014 09:42:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEE7F20A1B for ; Thu, 18 Dec 2014 09:42:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B02820A14 for ; Thu, 18 Dec 2014 09:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751697AbaLRJmA (ORCPT ); Thu, 18 Dec 2014 04:42:00 -0500 Received: from mail-wg0-f53.google.com ([74.125.82.53]:60082 "EHLO mail-wg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751653AbaLRJl7 (ORCPT ); Thu, 18 Dec 2014 04:41:59 -0500 Received: by mail-wg0-f53.google.com with SMTP id l18so1095481wgh.12 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:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uMMPxkG5o/NYXbFM26CtgMJX29BjjPBalqrwB5zUkes=; b=gWzv/fXVE0L7aVhN7JKe6Cjx+PTob07fbAErGTJG2OKLzub/EAnIxo0iwIqyTrK0Dh 3NBL6nAlh6FPuXUwOeCtQmNyYps0OKDp16d+pnTX9p3Urq6eXSXehwAHEhQytjBVO8Vs GzXAiQZ0eCeEGIzyJj67wGeBsMssLJmTcjK/HR2/Uibtz1/YsceOlLe9idd5IoFFtcCy 431jOLfXWpsC5U9XjDhmYcAI1odL6Udz1Oyle10yfV6rd090c2t4LTz6UngkKQwnlL0s xFpI0mjqDL4H+LOzOMlJeWrAyx26UDkPmE9HP8wrPGmTrFjyxuYrm+csivesMRL/32uf 8jEQ== X-Gm-Message-State: ALoCoQmKV/zXeq2XzKO7d7PDwFqHI9Lxqb+3VolBP/8qO+s7nafFs4GFUN1oyBnhWL/SN5Jj+2aG X-Received: by 10.194.110.69 with SMTP id hy5mr2306421wjb.121.1418895718216; Thu, 18 Dec 2014 01:41:58 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id w10sm8256264wje.10.2014.12.18.01.41.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Dec 2014 01:41:57 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Cc: Christian Daudt , Matt Porter , Florian Fainelli Subject: [PATCH 2/6] mmc: sdhci-bcm-kona: Handle error from mmc_of_parse() Date: Thu, 18 Dec 2014 10:41:40 +0100 Message-Id: <1418895704-25908-3-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: Christian Daudt Cc: Matt Porter Cc: Florian Fainelli Signed-off-by: Ulf Hansson Acked-by: Florian Fainelli --- drivers/mmc/host/sdhci-bcm-kona.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index e7e4fbd..34bb8f9 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -254,7 +254,9 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) kona_dev = sdhci_pltfm_priv(pltfm_priv); mutex_init(&kona_dev->write_lock); - mmc_of_parse(host->mmc); + ret = mmc_of_parse(host->mmc); + if (ret) + goto err_pltfm_free; if (!host->mmc->f_max) { dev_err(&pdev->dev, "Missing max-freq for SDHCI cfg\n");