nand: fix return value

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

diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c
index 894824728046c98c3c9416d2843554e1372cf3f5..65474e6eed6f9fbadaca15861584eebc2eeb5c6a 100644 (file)
--- a/src/flash/nand/fileio.c
+++ b/src/flash/nand/fileio.c
@@ -18,7 +18,7 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -99,7 +99,7 @@ int nand_fileio_start(struct command_context *cmd_ctx,
 int nand_fileio_cleanup(struct nand_fileio_state *state)
 {
        if (state->file_opened)
-               fileio_close(&state->fileio);
+               fileio_close(state->fileio);
 
        if (state->oob) {
                free(state->oob);
@@ -134,7 +134,7 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 
        if (NULL == nand->device) {
                command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
-               return ERROR_OK;
+               return ERROR_NAND_DEVICE_NOT_PROBED;
        }
 
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->address);
@@ -168,8 +168,8 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
                return retval;
 
        if (!need_size) {
-               int filesize;
-               retval = fileio_size(&state->fileio, &filesize);
+               size_t filesize;
+               retval = fileio_size(state->fileio, &filesize);
                if (retval != ERROR_OK)
                        return retval;
                state->size = filesize;
@@ -190,7 +190,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
        size_t one_read;
 
        if (NULL != s->page) {
-               fileio_read(&s->fileio, s->page_size, s->page, &one_read);
+               fileio_read(s->fileio, s->page_size, s->page, &one_read);
                if (one_read < s->page_size)
                        memset(s->page + one_read, 0xff, s->page_size - one_read);
                total_read += one_read;
@@ -219,7 +219,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
                        ecc += 10;
                }
        } else if (NULL != s->oob)   {
-               fileio_read(&s->fileio, s->oob_size, s->oob, &one_read);
+               fileio_read(s->fileio, s->oob_size, s->oob, &one_read);
                if (one_read < s->oob_size)
                        memset(s->oob + one_read, 0xff, s->oob_size - one_read);
                total_read += one_read;