From ffc08eae63ff933bff39f8bf23ee56136b9d95c8 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon@gmail.com>
Date: Sat, 6 Nov 2010 17:41:24 +0300
Subject: [PATCH] --- yaml --- r: 231675 b: refs/heads/master c:
 a0c5a3944ce121bb2417c771f77b18485cd84e18 h: refs/heads/master i:   231673:
 c20757e5c4a4012fda8fbf7745054d82381690c3   231671:
 06ec336ba1221a9719573037f56c32ee17600c8b v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mtd/mtdchar.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index de79150fc7bd..23dec5e8a42e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac80dac00f8630803dc0c7f8fbe6983a8e2a8b5f
+refs/heads/master: a0c5a3944ce121bb2417c771f77b18485cd84e18
diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c
index 4759d827e8c7..cad8fcc7b239 100644
--- a/trunk/drivers/mtd/mtdchar.c
+++ b/trunk/drivers/mtd/mtdchar.c
@@ -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;