]> git.sur5r.net Git - openocd/commitdiff
Fix assert to check flash programming offset
authorAttila Kinali <attila@kinali.ch>
Fri, 24 Feb 2012 10:18:12 +0000 (11:18 +0100)
committerSpencer Oliver <spen@spen-soft.co.uk>
Wed, 29 Feb 2012 11:21:07 +0000 (11:21 +0000)
The assert introduced in 00c864835149a96b431fc8f31dd89542d88fd383 checks
whether the programming offset equals to page_size of the flash, while it
wants to check whether the offset is a multiple of the page_size.

Change-Id: I794d021951a28c1cc520b5eea5d500f097721b06
Signed-off-by: Attila Kinali <attila@kinali.ch>
Reviewed-on: http://openocd.zylin.com/482
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
src/flash/nor/at91sam3.c

index b5074de7ca700c37a9c7081fa34a1503e3551a0f..0fb8657fce575d9eb83a37a523528d0f793d3627 100644 (file)
@@ -2845,7 +2845,7 @@ static int sam3_write(struct flash_bank *bank,
 
        /* By checking that offset is correct here, we also
        fix a clang warning */
-       assert(offset == pPrivate->page_size);
+       assert(offset % pPrivate->page_size == 0);
 
        /* intermediate large pages */
        /* also - the final *terminal* */