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

* git://git.infradead.org/mtd-2.6: (59 commits)
  mtd: mtdpart: disallow reading OOB past the end of the partition
  mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
  UBI: use mtd->writebufsize to set minimal I/O unit size
  mtd: initialize writebufsize in the MTD object of a partition
  mtd: onenand: add mtd->writebufsize initialization
  mtd: nand: add mtd->writebufsize initialization
  mtd: cfi: add writebufsize initialization
  mtd: add writebufsize field to mtd_info struct
  mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
  mtd: OneNAND: add enable / disable methods to onenand_chip
  mtd: m25p80: Fix JEDEC ID for AT26DF321
  mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
  mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
  mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
  mtd: nand: ams-delta: drop omap_read/write, use ioremap
  mtd: m25p80: add debugging trace in sst_write
  mtd: nand: ams-delta: select for built-in by default
  mtd: OneNAND: lighten scary initial bad block messages
  mtd: OneNAND: OMAP2/3: add support for command line partitioning
  mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
  ...

Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 98240575a18d..145b3d0dc0db 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -522,10 +522,6 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        /* Only master mtd device must be used to control partitions */
-        if (!mtd_is_master(mtd))
-                return -EINVAL;
-
         if (copy_from_user(&a, arg, sizeof(struct blkpg_ioctl_arg)))
                 return -EFAULT;
 
@@ -535,6 +531,10 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd,
         switch (a.op) {
         case BLKPG_ADD_PARTITION:
 
+                /* Only master mtd device must be used to add partitions */
+                if (mtd_is_partition(mtd))
+                        return -EINVAL;
+
                 return mtd_add_partition(mtd, p.devname, p.start, p.length);
 
         case BLKPG_DEL_PARTITION:
@@ -601,6 +601,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
         }
 
         case MEMGETINFO:
+                memset(&info, 0, sizeof(info));
                 info.type       = mtd->type;
                 info.flags      = mtd->flags;
                 info.size       = mtd->size;
@@ -609,7 +610,6 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
                 info.oobsize    = mtd->oobsize;
                 /* The below fields are obsolete */
                 info.ecctype    = -1;
-                info.eccsize    = 0;
                 if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
                         return -EFAULT;
                 break;