Commit b9e26dfd authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd: plat_ram: call mtd_device_register only if partition data exists
  mtd: pxa2xx-flash.c: It used to fall back to provided table.
  mtd: gpmi: add missing include 'module.h'
  mtd: ndfc: fix typo in structure dereference
parents 11da3764 c3298791
...@@ -227,10 +227,14 @@ static int platram_probe(struct platform_device *pdev) ...@@ -227,10 +227,14 @@ static int platram_probe(struct platform_device *pdev)
if (!err) if (!err)
dev_info(&pdev->dev, "registered mtd device\n"); dev_info(&pdev->dev, "registered mtd device\n");
/* add the whole device. */ if (pdata->nr_partitions) {
err = mtd_device_register(info->mtd, NULL, 0); /* add the whole device. */
if (err) err = mtd_device_register(info->mtd, NULL, 0);
dev_err(&pdev->dev, "failed to register the entire device\n"); if (err) {
dev_err(&pdev->dev,
"failed to register the entire device\n");
}
}
return err; return err;
......
...@@ -98,7 +98,7 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev) ...@@ -98,7 +98,7 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
} }
info->mtd->owner = THIS_MODULE; info->mtd->owner = THIS_MODULE;
mtd_device_parse_register(info->mtd, probes, 0, NULL, 0); mtd_device_parse_register(info->mtd, probes, 0, flash->parts, flash->nr_parts);
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
return 0; return 0;
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/mtd/gpmi-nand.h> #include <linux/mtd/gpmi-nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include "gpmi-nand.h" #include "gpmi-nand.h"
/* add our owner bbt descriptor */ /* add our owner bbt descriptor */
......
...@@ -188,7 +188,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc, ...@@ -188,7 +188,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
if (!flash_np) if (!flash_np)
return -ENODEV; return -ENODEV;
ppdata->of_node = flash_np; ppdata.of_node = flash_np;
ndfc->mtd.name = kasprintf(GFP_KERNEL, "%s.%s", ndfc->mtd.name = kasprintf(GFP_KERNEL, "%s.%s",
dev_name(&ndfc->ofdev->dev), flash_np->name); dev_name(&ndfc->ofdev->dev), flash_np->name);
if (!ndfc->mtd.name) { if (!ndfc->mtd.name) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment