From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulf Hansson Subject: Re: [PATCH 1/5 RFC] mmc: sdhci-iproc: Clean up platform allocations if shdci init fails Date: Wed, 27 Jan 2016 15:16:15 +0100 Message-ID: References: <1453042744-16196-1-git-send-email-stefan.wahren@i2se.com> <1453042744-16196-2-git-send-email-stefan.wahren@i2se.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: <1453042744-16196-2-git-send-email-stefan.wahren@i2se.com> Sender: linux-mmc-owner@vger.kernel.org To: Stefan Wahren Cc: Scott Branden , Ray Jui , Jon Mason , Stephen Warren , Lee Jones , Eric Anholt , Rob Herring , Mark Rutland , Arnd Bergmann , kernel@martin.sperl.org, "devicetree@vger.kernel.org" , linux-rpi-kernel@lists.infradead.org, linux-mmc , bcm-kernel-feedback-list@broadcom.com List-Id: devicetree@vger.kernel.org On 17 January 2016 at 15:59, Stefan Wahren wrote: > 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 Thanks, applied for next! Kind regards Uffe > --- > 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); > -- > 1.7.9.5 >