Merge remote-tracking branch 'origin/time_upgrade' into 64_and_32_bit_time_tests

[yaffs2.git] / yaffs_tagsmarshall.c

diff --git a/yaffs_tagsmarshall.c b/yaffs_tagsmarshall.c
index cded165b367c53aedbaead792b5cae550a5d85ee..d568208e91bd53ece6b685707ecca481c693c183 100644 (file)
--- a/yaffs_tagsmarshall.c
+++ b/yaffs_tagsmarshall.c
@@ -14,7 +14,7 @@
  * tags storage.
  */
 
-#include "yaffs_guts.h"
+#include "yaffs_tagsmarshall.h"
 #include "yaffs_trace.h"
 #include "yaffs_packedtags2.h"
 
@@ -172,10 +172,7 @@ static int yaffs_tags_marshall_query_block(struct yaffs_dev *dev, int block_no,
                "block query returns  seq %d state %d",
                *seq_number, *state);
 
-       if (retval == 0)
-               return YAFFS_OK;
-       else
-               return YAFFS_FAIL;
+       return retval;
 }
 
 static int yaffs_tags_marshall_mark_bad(struct yaffs_dev *dev, int block_no)