2 files changed, 11 insertions, 1 deletions

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 68ae144ce3be..4e7073954e53 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -334,7 +334,7 @@ config MTD_NAND_ATMEL_ECC_NONE
 endchoice
 
 config MTD_NAND_PXA3xx
-        bool "Support for NAND flash devices on PXA3xx"
+        tristate "Support for NAND flash devices on PXA3xx"
         depends on MTD_NAND && PXA3xx
         help
           This enables the driver for the NAND flash device found on
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index ffa960baa7e7..ead4a7a72d44 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1079,6 +1079,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
 
         this = &info->nand_chip;
         mtd->priv = info;
+        mtd->owner = THIS_MODULE;
 
         info->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(info->clk)) {
@@ -1187,6 +1188,7 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
 {
         struct mtd_info *mtd = platform_get_drvdata(pdev);
         struct pxa3xx_nand_info *info = mtd->priv;
+        struct resource *r;
 
         platform_set_drvdata(pdev, NULL);
 
@@ -1199,6 +1201,14 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
                                 info->data_buff, info->data_buff_phys);
         } else
                 kfree(info->data_buff);
+
+        iounmap(info->mmio_base);
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(r->start, resource_size(r));
+
+        clk_disable(info->clk);
+        clk_put(info->clk);
+
         kfree(mtd);
         return 0;
 }