From cba5ab6e8444bef4fe90273228839deb25e49ab8 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 4 Mar 2013 14:56:18 +0200 Subject: [PATCH] --- yaml --- r: 374719 b: refs/heads/master c: 3239a6cdef0be60ec2dadc501cf385dc419d7452 h: refs/heads/master i: 374717: 1371b2fb85925c4bfcf7f5fbf1c58e3321b71ea7 374715: 957c698a68b0c3d71769067d8e7d134e5a88f4f4 374711: 8b5baa0eafcb30196a9101acbfacb5eadb7b65ab 374703: ebcb46d6daa34b5974da1c0a7fcbf2b01778b62e 374687: 6d29184fb30662aee07e503168784a166ad240d2 374655: 821bc6a37da7ad0ce1d5ae95e503a1967d2b6780 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 2 +- trunk/include/linux/mtd/nand.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa2b8c759bcd..9b59c043c306 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88ad4b162adb3821815d0098987040fca26c7d80 +refs/heads/master: 3239a6cdef0be60ec2dadc501cf385dc419d7452 diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index 39154aa50fcc..11ee9d47f53e 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/drivers/mtd/nand/nand_base.c @@ -2059,7 +2059,7 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, */ cached = 0; - if (!cached || !(chip->options & NAND_CACHEPRG)) { + if (!cached || !NAND_HAS_CACHEPROG(chip)) { chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1); status = chip->waitfunc(mtd, chip); diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index ec0a74877714..07d7a3dc5582 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -167,7 +167,7 @@ typedef enum { #define NAND_SUBPAGE_READ 0x00001000 /* Options valid for Samsung large page devices */ -#define NAND_SAMSUNG_LP_OPTIONS (NAND_CACHEPRG) +#define NAND_SAMSUNG_LP_OPTIONS NAND_CACHEPRG /* Macros to identify the above */ #define NAND_HAS_CACHEPROG(chip) ((chip->options & NAND_CACHEPRG))