diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-11-30 16:24:52 +0000 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-12-03 12:49:38 +0000 |
| commit | f6f0f81895ad8272905bf3d637b7c99a62238d79 (patch) | |
| tree | 147dab59d278dccaf45971060df5e7653a2bfb6f | |
| parent | 5d3cce3b8ef45317c59487f4d83dc43c355ae40a (diff) | |
| download | talos-op-linux-f6f0f81895ad8272905bf3d637b7c99a62238d79.tar.gz talos-op-linux-f6f0f81895ad8272905bf3d637b7c99a62238d79.zip | |
[MTD] [NOR] Fix overflow check in jedec_probe
Having laid the code out so that it's easier to read instead of sticking
to the 80-column guideline even when it doesn't make sense, a bug is
immediately spotted... we were only checking _one_ of the unlock
addresses to see if it runs off the end of the map.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | drivers/mtd/chips/jedec_probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c index cb8c34da360a..6041ce8908e3 100644 --- a/drivers/mtd/chips/jedec_probe.c +++ b/drivers/mtd/chips/jedec_probe.c @@ -1952,7 +1952,7 @@ static int jedec_probe_chip(struct map_info *map, __u32 base, } /* Ensure the unlock addresses we try stay inside the map */ probe_offset1 = cfi_build_cmd_addr(cfi->addr_unlock1, cfi_interleave(cfi), cfi->device_type); - probe_offset2 = cfi_build_cmd_addr(cfi->addr_unlock1, cfi_interleave(cfi), cfi->device_type); + probe_offset2 = cfi_build_cmd_addr(cfi->addr_unlock2, cfi_interleave(cfi), cfi->device_type); if ( ((base + probe_offset1 + map_bankwidth(map)) >= map->size) || ((base + probe_offset2 + map_bankwidth(map)) >= map->size)) goto retry; |
