From patchwork Sun Jan 17 14:59:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 8050701 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C03DE9F6FA for ; Sun, 17 Jan 2016 15:00:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD37220260 for ; Sun, 17 Jan 2016 15:00:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 039BD2015E for ; Sun, 17 Jan 2016 15:00:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754AbcAQPAP (ORCPT ); Sun, 17 Jan 2016 10:00:15 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:63843 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752499AbcAQPAN (ORCPT ); Sun, 17 Jan 2016 10:00:13 -0500 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0M003o-1a22Qr1n4O-00uKk2; Sun, 17 Jan 2016 15:59:33 +0100 From: Stefan Wahren To: Scott Branden , Ray Jui , Jon Mason , Stephen Warren , Lee Jones , Eric Anholt Cc: Rob Herring , Mark Rutland , Arnd Bergmann , Ulf Hansson , kernel@martin.sperl.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Stefan Wahren Subject: [PATCH 1/5 RFC] mmc: sdhci-iproc: Clean up platform allocations if shdci init fails Date: Sun, 17 Jan 2016 14:59:00 +0000 Message-Id: <1453042744-16196-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1453042744-16196-1-git-send-email-stefan.wahren@i2se.com> References: <1453042744-16196-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:XIZIVVPJO5SKxbA9nQJbgWWZJkY3L6S6soMTHm/SwtyL/l4HKRU fB2X/AqoQ3rvwy/azJh6LJLOP5XRSQCcOxMZhOi+G/HZprKSAP/JWeMijP8wEZEky+pXZAY ACMU6UWBUVmRQFjqCASHLHnKvvxUh64DY5hPtMg+GvztZwnEIGPgeHQWfIVABL8LNksKWJk KgFigcDoeO40hUOyBj5tg== X-UI-Out-Filterresults: notjunk:1; V01:K0:LfdAHLyTQpk=:M1UejR8sRW94P90XQ0Pdkv j/3WSvayMH3fo97gcZrKODSNENxKo/+abfkixrUu4MLo9bupHK3Smiz/3h9XeNlPC0rNSrDlD NtHrh9AnbUcv+Fduu+7QKOOsAfWwtVFIHOEw58w+nwSzm6382zXlrNLhb/L/FmfVvSDkyJM6V tieOdVyGuKl7ExIprp78+sMCxN18B/mVpEUKRzKIqFzhoTswRQR9Nf0Af+ILGpkkDyNXJrFD6 hfKhuxTdbCb+8ONNRn8jkRjGHqEXmFzQoviLomMsa4ruXuza3jH9Nb8HSv4mkDyiGDSvkmJN3 huxcQPNR3Ic6zWEKAY0kqroVj1yC1qrqcElgof/uCaRcGak2s8eAbvdAXnkmIkixhvMlh5Tlf DNjS0ZYxPgJCvBsOaUAZlCEU36t90A3AvEW9C9W/5B/VIvb1xYjmcyfvx2On7w16S/4GDZngC aKePrfR9ZVESoJ8d1b36CQ3HLFBwY7FyIORWzP9GE8s8M0LZmKMb4UttCMkaeExYgH/EnXEjO 8tSB1C4yHmyTVdP0IRiSlAdYpuReYG6OP6kK81fPp6qdKiJa9uEJs5FULjHpCeER4jM3LKVUX y+FI+NNqV8HVN2NsJ69TUW/AoP9LaLo34scRSDXQ9f036LeAWBHB9rSP+ourBBGzr6OiJ3Ulv 59G9UVzpWeUUp0Nq5iEgLp/pGZhZaa3zudNVBlGSOZmrnvt9bvuN6N5qI2EwwHCh3Z88= 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, 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 This patch adopts the changes from 475c9e43bfa7 ("mmc: sdhci-bcm2835: Clean up platform allocations if sdhci init fails") to sdhci-iproc. Signed-off-by: Stefan Wahren Acked-by: Scott Branden --- drivers/mmc/host/sdhci-iproc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index 3b423b0..e22060a 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -213,7 +213,11 @@ static int sdhci_iproc_probe(struct platform_device *pdev) host->caps1 = iproc_host->data->caps1; } - return sdhci_add_host(host); + ret = sdhci_add_host(host); + if (ret) + goto err; + + return 0; err: sdhci_pltfm_free(pdev);