Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9e26dfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/mtd/maps/plat-ram.c

+8 −4
Original line number Diff line number Diff line
@@ -227,10 +227,14 @@ static int platram_probe(struct platform_device *pdev) 
	if (!err)

		dev_info(&pdev->dev, "registered mtd device\n");



	if (pdata->nr_partitions) {

		/* add the whole device. */

		err = mtd_device_register(info->mtd, NULL, 0);

	if (err)

		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;

drivers/mtd/maps/pxa2xx-flash.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev) 
	}

	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);

	return 0;

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <linux/clk.h>

#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/mtd/gpmi-nand.h>

#include <linux/mtd/partitions.h>



#include "gpmi-nand.h"



/* add our owner bbt descriptor */

drivers/mtd/nand/ndfc.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc, 
	if (!flash_np)

		return -ENODEV;



	ppdata->of_node = flash_np;

	ppdata.of_node = flash_np;

	ndfc->mtd.name = kasprintf(GFP_KERNEL, "%s.%s",

			dev_name(&ndfc->ofdev->dev), flash_np->name);

	if (!ndfc->mtd.name) {