From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Hauer Subject: Re: [PATCH] mxcmmc: fix error path in mxcmci_probe Date: Thu, 24 Sep 2009 11:51:42 +0200 Message-ID: <20090924095142.GL27039@pengutronix.de> References: <1253778254-6881-1-git-send-email-u.kleine-koenig@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:42958 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751206AbZIXJvo (ORCPT ); Thu, 24 Sep 2009 05:51:44 -0400 Content-Disposition: inline In-Reply-To: <1253778254-6881-1-git-send-email-u.kleine-koenig@pengutronix.de> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Uwe =?iso-8859-15?Q?Kleine-K=F6nig?= Cc: linux-mmc@vger.kernel.org, Pierre Ossman , Martin Fuzzey , Pierre Ossman On Thu, Sep 24, 2009 at 09:44:14AM +0200, Uwe Kleine-K=F6nig wrote: > After a failing allocation of mmc or a failed ioremap in mxcmci_probe= host was > used uninitialized. Acked-by: Sascha Hauer >=20 > Signed-off-by: Uwe Kleine-K=F6nig > Cc: Sascha Hauer > Cc: Pierre Ossman > Cc: Martin Fuzzey > Cc: Pierre Ossman > --- > drivers/mmc/host/mxcmmc.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c > index bc14bb1..bec4605 100644 > --- a/drivers/mmc/host/mxcmmc.c > +++ b/drivers/mmc/host/mxcmmc.c > @@ -679,17 +679,17 @@ static int mxcmci_probe(struct platform_device = *pdev) > { > struct mmc_host *mmc; > struct mxcmci_host *host =3D NULL; > - struct resource *r; > + struct resource *iores, *r; > int ret =3D 0, irq; > =20 > printk(KERN_INFO "i.MX SDHC driver\n"); > =20 > - r =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); > + iores =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); > irq =3D platform_get_irq(pdev, 0); > - if (!r || irq < 0) > + if (!iores || irq < 0) > return -EINVAL; > =20 > - r =3D request_mem_region(r->start, resource_size(r), pdev->name); > + r =3D request_mem_region(iores->start, resource_size(iores), pdev->= name); > if (!r) > return -EBUSY; > =20 > @@ -809,7 +809,7 @@ out_iounmap: > out_free: > mmc_free_host(mmc); > out_release_mem: > - release_mem_region(host->res->start, resource_size(host->res)); > + release_mem_region(iores->start, resource_size(iores)); > return ret; > } > =20 > --=20 > 1.6.4.3 >=20 --=20 Pengutronix e.K. | = | Industrial Linux Solutions | http://www.pengutronix.de/= | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 = | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-555= 5 |