Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 298133
b: refs/heads/master
c: d42b5de
h: refs/heads/master
i:
  298131: cee08ff
v: v3
  • Loading branch information
Huang Shijie authored and David Woodhouse committed Mar 26, 2012
1 parent c192dd8 commit 4ad623f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 921de864b7c6413f15224d8f5e677541e8e1ac6d
refs/heads/master: d42b5de35fb058513367d1a9ee146be5aaab7c6a
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/nand/nand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -2853,7 +2853,6 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
chip->read_byte(mtd) != 'F' || chip->read_byte(mtd) != 'I')
return 0;

pr_info("ONFI flash detected\n");
chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);
for (i = 0; i < 3; i++) {
chip->read_buf(mtd, (uint8_t *)p, sizeof(*p));
Expand Down Expand Up @@ -2903,6 +2902,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
chip->options |= (NAND_NO_READRDY |
NAND_NO_AUTOINCR) & NAND_CHIPOPTIONS_MSK;

pr_info("ONFI flash detected\n");
return 1;
}

Expand Down

0 comments on commit 4ad623f

Please sign in to comment.