aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/mtdchar.c4
-rw-r--r--include/mtd/mtd-abi.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 1547e2a68279..8feb5fdcd97b 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -672,8 +672,8 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
672 info.erasesize = mtd->erasesize; 672 info.erasesize = mtd->erasesize;
673 info.writesize = mtd->writesize; 673 info.writesize = mtd->writesize;
674 info.oobsize = mtd->oobsize; 674 info.oobsize = mtd->oobsize;
675 /* The below fields are obsolete */ 675 /* The below field is obsolete */
676 info.ecctype = -1; 676 info.padding = 0;
677 if (copy_to_user(argp, &info, sizeof(struct mtd_info_user))) 677 if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
678 return -EFAULT; 678 return -EFAULT;
679 break; 679 break;
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index 7dee9709fbfc..1a7e1d20adf9 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -129,10 +129,7 @@ struct mtd_info_user {
129 __u32 erasesize; 129 __u32 erasesize;
130 __u32 writesize; 130 __u32 writesize;
131 __u32 oobsize; /* Amount of OOB data per block (e.g. 16) */ 131 __u32 oobsize; /* Amount of OOB data per block (e.g. 16) */
132 /* The below two fields are obsolete and broken, do not use them 132 __u64 padding; /* Old obsolete field; do not use */
133 * (TODO: remove at some point) */
134 __u32 ecctype;
135 __u32 eccsize;
136}; 133};
137 134
138struct region_info_user { 135struct region_info_user {