Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310238
b: refs/heads/master
c: 5df41de
h: refs/heads/master
v: v3
  • Loading branch information
David Woodhouse authored and David Woodhouse committed May 14, 2012
1 parent 58fd035 commit 9003d60
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 43dc03c7ba644620283523b7ae62da94bb81fdbb
refs/heads/master: 5df41de5870e2184e75a8cb133ca81888006f097
6 changes: 3 additions & 3 deletions trunk/drivers/mtd/chips/cfi_cmdset_0002.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static void fixup_s29gl064n_sectors(struct mtd_info *mtd)

if ((cfi->cfiq->EraseRegionInfo[0] & 0xffff) == 0x003f) {
cfi->cfiq->EraseRegionInfo[0] |= 0x0040;
pr_warning("%s: Bad S29GL064N CFI data, adjust from 64 to 128 sectors\n", mtd->name);
pr_warning("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n", mtd->name);
}
}

Expand All @@ -328,7 +328,7 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd)

if ((cfi->cfiq->EraseRegionInfo[1] & 0xffff) == 0x007e) {
cfi->cfiq->EraseRegionInfo[1] &= ~0x0040;
pr_warning("%s: Bad S29GL032N CFI data, adjust from 127 to 63 sectors\n", mtd->name);
pr_warning("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n", mtd->name);
}
}

Expand All @@ -342,7 +342,7 @@ static void fixup_s29ns512p_sectors(struct mtd_info *mtd)
* which is not permitted by CFI.
*/
cfi->cfiq->EraseRegionInfo[0] = 0x020001ff;
pr_warning("%s: Bad S29NS512P CFI data, adjust to 512 sectors\n", mtd->name);
pr_warning("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n", mtd->name);
}

/* Used to fix CFI-Tables of chips without Extended Query Tables */
Expand Down

0 comments on commit 9003d60

Please sign in to comment.