Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / mtd / nand / raw / intel-nand-controller.c

diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c
index 709f040..b9784f3 100644 (file)
--- a/drivers/mtd/nand/raw/intel-nand-controller.c
+++ b/drivers/mtd/nand/raw/intel-nand-controller.c
@@ -631,19 +631,26 @@ static int ebu_nand_probe(struct platform_device *pdev)
        ebu_host->clk_rate = clk_get_rate(ebu_host->clk);
 
        ebu_host->dma_tx = dma_request_chan(dev, "tx");
-       if (IS_ERR(ebu_host->dma_tx))
-               return dev_err_probe(dev, PTR_ERR(ebu_host->dma_tx),
-                                    "failed to request DMA tx chan!.\n");
+       if (IS_ERR(ebu_host->dma_tx)) {
+               ret = dev_err_probe(dev, PTR_ERR(ebu_host->dma_tx),
+                                   "failed to request DMA tx chan!.\n");
+               goto err_disable_unprepare_clk;
+       }
 
        ebu_host->dma_rx = dma_request_chan(dev, "rx");
-       if (IS_ERR(ebu_host->dma_rx))
-               return dev_err_probe(dev, PTR_ERR(ebu_host->dma_rx),
-                                    "failed to request DMA rx chan!.\n");
+       if (IS_ERR(ebu_host->dma_rx)) {
+               ret = dev_err_probe(dev, PTR_ERR(ebu_host->dma_rx),
+                                   "failed to request DMA rx chan!.\n");
+               ebu_host->dma_rx = NULL;
+               goto err_cleanup_dma;
+       }
 
        resname = devm_kasprintf(dev, GFP_KERNEL, "addr_sel%d", cs);
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, resname);
-       if (!res)
-               return -EINVAL;
+       if (!res) {
+               ret = -EINVAL;
+               goto err_cleanup_dma;
+       }
        ebu_host->cs[cs].addr_sel = res->start;
        writel(ebu_host->cs[cs].addr_sel | EBU_ADDR_MASK(5) | EBU_ADDR_SEL_REGEN,
               ebu_host->ebu + EBU_ADDR_SEL(cs));
@@ -653,7 +660,8 @@ static int ebu_nand_probe(struct platform_device *pdev)
        mtd = nand_to_mtd(&ebu_host->chip);
        if (!mtd->name) {
                dev_err(ebu_host->dev, "NAND label property is mandatory\n");
-               return -EINVAL;
+               ret = -EINVAL;
+               goto err_cleanup_dma;
        }
 
        mtd->dev.parent = dev;
@@ -681,6 +689,7 @@ err_clean_nand:
        nand_cleanup(&ebu_host->chip);
 err_cleanup_dma:
        ebu_dma_cleanup(ebu_host);
+err_disable_unprepare_clk:
        clk_disable_unprepare(ebu_host->clk);
 
        return ret;