From: Andreas Fritiofson Date: Sun, 30 Sep 2012 21:03:44 +0000 (+0200) Subject: flash/nor/stellaris: Remove unnecessary write_algorithm check X-Git-Tag: v0.7.0-rc1~203 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=8415353f2b15af52363ce88df0b16f8b857d7967;hp=4da4e1cfb7d93dcedc333c11c787b83b8baf7dfa flash/nor/stellaris: Remove unnecessary write_algorithm check The pointer must be non-null here since we returned if allocation failed. Change-Id: I9b75099ed3b3870c815d1df5760ed1f3fe1d20d6 Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/866 Reviewed-by: Freddie Chopin Tested-by: jenkins Reviewed-by: Spencer Oliver --- diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 0bb93693af..6721395bb2 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -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)",