mxcmmc: fix error path in mxcmci_probe
Subsystems (2)
PATCH 168/196 mxcmmc: fix error path in mxcmci_probe
From: Uwe Kleine-König <[email protected]>
After a failing allocation of mmc or a failed ioremap in mxcmci_probe host was used uninitialized.
Signed-off-by Uwe Kleine-König <[email protected]>
Acked-by Sascha Hauer <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc Martin Fuzzey <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mmc/host/mxcmmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mmc/host/mxcmmc.c renamed from drivers/mmc/host/mxcmmc.c~mxcmmc-fix-error-path-in-mxcmci_probe +5 -5
@@ -679,17 +679,17 @@ static int mxcmci_probe(struct platform_ {struct mmc_host *mmc;struct mxcmci_host *host =NULL ; -struct resource *r; +struct resource *iores, *r;int ret =0 , irq;printk (KERN_INFO "i.MX SDHC driver\n" ); - r =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + iores =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); irq =platform_get_irq (pdev,0 ); -if (!r || irq <0 ) +if (!iores || irq <0 )return -EINVAL ; - r =request_mem_region (r->start,resource_size (r), pdev->name); + r =request_mem_region (iores->start,resource_size (iores), pdev->name);if (!r)return -EBUSY ;
@@ -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; }
_