Tcl commands: Fix improper return status in flash commands and load_image.

[openocd.git] / src / flash / nand / tcl.c

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 5db29ab869787fd41c2ca3f856089145fc8c934a..d9738c55b272e9e7959edf3d146c701fb4fe14f4 100644 (file)
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -256,7 +254,8 @@ COMMAND_HANDLER(handle_nand_write_command)
                int bytes_read = nand_fileio_read(nand, &s);
                if (bytes_read <= 0) {
                        command_print(CMD_CTX, "error while reading file");
-                       return nand_fileio_cleanup(&s);
+                       nand_fileio_cleanup(&s);
+                       return ERROR_FAIL;
                }
                s.size -= bytes_read;
 
@@ -266,7 +265,8 @@ COMMAND_HANDLER(handle_nand_write_command)
                        command_print(CMD_CTX, "failed writing file %s "
                                "to NAND flash %s at offset 0x%8.8" PRIx32,
                                CMD_ARGV[1], CMD_ARGV[0], s.address);
-                       return nand_fileio_cleanup(&s);
+                       nand_fileio_cleanup(&s);
+                       return retval;
                }
                s.address += s.page_size;
        }