diff options
author | Xavier Boudet <x-boudet@ti.com> | 2012-11-05 14:20:49 +0100 |
---|---|---|
committer | Xavier Boudet <x-boudet@ti.com> | 2012-11-05 14:20:49 +0100 |
commit | 29a6cc6e3a241e34749edc3cc69cf88757acd491 (patch) | |
tree | 6a0efb8175f50c183e0541cbb1b1f8c2d3979493 /drivers/mtd/nand | |
parent | 3374c3584e1cb313f62b6a13418e477625c4a25e (diff) | |
parent | 5390967b2f98e6aa46f20eae09580e7db73826b9 (diff) |
Merge remote-tracking branch 'remotes/upstream-stable/linux-3.4.y' into tilt-3.4
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 47b19c0bb070..eb9f5fb02eef 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2897,9 +2897,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, if (le16_to_cpu(p->features) & 1) *busw = NAND_BUSWIDTH_16; - chip->options &= ~NAND_CHIPOPTIONS_MSK; - chip->options |= (NAND_NO_READRDY | - NAND_NO_AUTOINCR) & NAND_CHIPOPTIONS_MSK; + chip->options |= NAND_NO_READRDY | NAND_NO_AUTOINCR; pr_info("ONFI flash detected\n"); return 1; @@ -3064,9 +3062,8 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, mtd->erasesize <<= ((id_data[3] & 0x03) << 1); } } - /* Get chip options, preserve non chip based options */ - chip->options &= ~NAND_CHIPOPTIONS_MSK; - chip->options |= type->options & NAND_CHIPOPTIONS_MSK; + /* Get chip options */ + chip->options |= type->options; /* * Check if chip is not a Samsung device. Do not clear the |