flash/nor/stellaris: Remove unnecessary write_algorithm check
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>
Sun, 30 Sep 2012 21:03:44 +0000 (23:03 +0200)
committerSpencer Oliver <spen@spen-soft.co.uk>
Mon, 8 Oct 2012 10:25:50 +0000 (10:25 +0000)
The pointer must be non-null here since we returned if allocation failed.

Change-Id: I9b75099ed3b3870c815d1df5760ed1f3fe1d20d6
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/866
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
src/flash/nor/stellaris.c

index 0bb9369..6721395 100644 (file)
@@ -1031,8 +1031,7 @@ static int stellaris_write_block(struct flash_bank *bank,
        while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) {
                buffer_size /= 2;
                if (buffer_size <= buf_min) {
-                       if (write_algorithm)
-                               target_free_working_area(target, write_algorithm);
+                       target_free_working_area(target, write_algorithm);
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
                LOG_DEBUG("retry target_alloc_working_area(%s, size=%u)",