zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cfi: fix error handling for protect fn 

No error was propagated.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
__archive__
Øyvind Harboe 2010-05-05 09:32:03 +02:00
parent 2fba796e27
commit 3077f5845f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nor/cfi.c
View File

@ -3,6 +3,7 @@
* Dominic.Rath@gmx.de * * Dominic.Rath@gmx.de *
* Copyright (C) 2009 Michael Schwingen * * Copyright (C) 2009 Michael Schwingen *
* michael@schwingen.org * * michael@schwingen.org *
* Copyright (C) 2010 Øyvind Harboe <oyvind.harboe@zylin.com> *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
@ -887,6 +888,7 @@ static int cfi_protect(struct flash_bank *bank, int set, int first, int last)
if ((first < 0) || (last < first) || (last >= bank->num_sectors)) if ((first < 0) || (last < first) || (last >= bank->num_sectors))
{ {
LOG_ERROR("Invalid sector range");
return ERROR_FLASH_SECTOR_INVALID; return ERROR_FLASH_SECTOR_INVALID;
} }
@ -897,14 +899,12 @@ static int cfi_protect(struct flash_bank *bank, int set, int first, int last)
{ {
case 1: case 1:
case 3: case 3:
cfi_intel_protect(bank, set, first, last); return cfi_intel_protect(bank, set, first, last);
break; break;
default: default:
LOG_ERROR("protect: cfi primary command set %i unsupported", cfi_info->pri_id); LOG_ERROR("protect: cfi primary command set %i unsupported", cfi_info->pri_id);
break; return ERROR_FAIL;
} }
return ERROR_OK;
} }
/* FIXME Replace this by a simple memcpy() - still unsure about sideeffects */ /* FIXME Replace this by a simple memcpy() - still unsure about sideeffects */