From 85de60f02a79a6b1f2dc58e52ac834d9c1676c8a Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 30 Nov 2007 16:24:52 +0000 Subject: [PATCH] --- yaml --- r: 84209 b: refs/heads/master c: f6f0f81895ad8272905bf3d637b7c99a62238d79 h: refs/heads/master i: 84207: 4957fce1db742948907c70dcd4bd57a96702162b v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/jedec_probe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f58170af713e..2b33fbf24a51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d3cce3b8ef45317c59487f4d83dc43c355ae40a +refs/heads/master: f6f0f81895ad8272905bf3d637b7c99a62238d79 diff --git a/trunk/drivers/mtd/chips/jedec_probe.c b/trunk/drivers/mtd/chips/jedec_probe.c index cb8c34da360a..6041ce8908e3 100644 --- a/trunk/drivers/mtd/chips/jedec_probe.c +++ b/trunk/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;