From 40a989d1ae5b18f68f43de739c8e15fa6734a9e2 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 19 Aug 2011 10:07:52 -0700 Subject: nandwrite: kill more MEMSETOOBSEL Signed-off-by: Brian Norris Signed-off-by: Artem Bityutskiy --- nandwrite.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'nandwrite.c') diff --git a/nandwrite.c b/nandwrite.c index 21e00a2..a73a524 100644 --- a/nandwrite.c +++ b/nandwrite.c @@ -44,10 +44,6 @@ #include // oob layouts to pass into the kernel as default -static struct nand_oobinfo none_oobinfo = { - .useecc = MTD_NANDECC_OFF, -}; - static struct nand_oobinfo jffs2_oobinfo = { .useecc = MTD_NANDECC_PLACE, .eccbytes = 6, @@ -318,18 +314,7 @@ int main(int argc, char * const argv[]) } else { switch (errno) { case ENOTTY: - if (ioctl(fd, MEMGETOOBSEL, &old_oobinfo) != 0) { - perror("MEMGETOOBSEL"); - close(fd); - exit(EXIT_FAILURE); - } - if (ioctl(fd, MEMSETOOBSEL, &none_oobinfo) != 0) { - perror("MEMSETOOBSEL"); - close(fd); - exit(EXIT_FAILURE); - } - oobinfochanged = 1; - break; + errmsg_die("ioctl MTDFILEMODE is missing"); default: perror("MTDFILEMODE"); close(fd); @@ -670,15 +655,6 @@ restoreoob: libmtd_close(mtd_desc); free(filebuf); free(oobbuf); - - if (oobinfochanged == 1) { - if (ioctl(fd, MEMSETOOBSEL, &old_oobinfo) != 0) { - perror("MEMSETOOBSEL"); - close(fd); - exit(EXIT_FAILURE); - } - } - close(fd); if (failed -- cgit v1.2.3