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

Commit 936813a8 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] NAND: Select chip before checking write protect status
  [MTD] CORE mtdchar.c: fix off-by-one error in lseek()
  [MTD] NAND: Fix typo in mtd/nand/ts7250.c
  [JFFS2][XATTR] coexistence between xattr and write buffering support.
  [JFFS2][XATTR] Fix wrong copyright
  [JFFS2][XATTR] Re-define xd->refcnt as atomic_t
  [JFFS2][XATTR] Fix memory leak with jffs2_xattr_ref
  [JFFS2][XATTR] rid unnecessary writing of delete marker.
  [JFFS2][XATTR] Fix ACL bug when updating null xattr by null ACL.
  [JFFS2][XATTR] using 'delete marker' for xdatum/xref deletion
  [MTD] Fix off-by-one error in physmap.c
  [MTD] Remove unused 'nr_banks' variable from ixp2000 map driver
  [MTD NAND] s3c2412 support in s3c2410.c
  [MTD] Initialize 'writesize'
  [MTD] NAND: ndfc fix address offset thinko
  [MTD] NAND: S3C2410 convert prinks to dev_*()s
  [MTD] NAND: Missing fixups
parents 73a0e405 6a930961

drivers/mtd/chips/cfi_cmdset_0001.c

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary) 
	mtd->resume  = cfi_intelext_resume;

	mtd->flags   = MTD_CAP_NORFLASH;

	mtd->name    = map->name;

	mtd->writesize = 1;



	mtd->reboot_notifier.notifier_call = cfi_intelext_reboot;

drivers/mtd/chips/jedec.c

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ static struct mtd_info *jedec_probe(struct map_info *map) 
   MTD->name = map->name;

   MTD->type = MTD_NORFLASH;

   MTD->flags = MTD_CAP_NORFLASH;

   MTD->writesize = 1;

   MTD->erasesize = SectorSize*(map->buswidth);

   //   printk("MTD->erasesize is %x\n",(unsigned int)MTD->erasesize);

   MTD->size = priv->size;

drivers/mtd/chips/map_absent.c

+2 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static struct mtd_info *map_absent_probe(struct map_info *map) 
	mtd->sync 	= map_absent_sync;

	mtd->flags 	= 0;

	mtd->erasesize  = PAGE_SIZE;

	mtd->writesize  = 1;



	__module_get(THIS_MODULE);

	return mtd;

drivers/mtd/chips/map_ram.c

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static struct mtd_info *map_ram_probe(struct map_info *map) 
	mtd->write = mapram_write;

	mtd->sync = mapram_nop;

	mtd->flags = MTD_CAP_RAM;

	mtd->writesize = 1;



	mtd->erasesize = PAGE_SIZE;

 	while(mtd->size & (mtd->erasesize - 1))

drivers/mtd/chips/map_rom.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static struct mtd_info *map_rom_probe(struct map_info *map) 
	mtd->sync = maprom_nop;

	mtd->flags = MTD_CAP_ROM;

	mtd->erasesize = map->size;

	mtd->writesize = 1;



	__module_get(THIS_MODULE);

	return mtd;