2 files changed, 13 insertions, 5 deletions

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 2ff62157d3bb..c1f5c29e458e 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -707,11 +707,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
                              fmvhdr->vol_type,
                              be32_to_cpu(fmvhdr->last_eb_bytes));
 
-                if (!av)
-                        goto fail_bad;
-                if (PTR_ERR(av) == -EINVAL) {
-                        ubi_err(ubi, "volume (ID %i) already exists",
-                                fmvhdr->vol_id);
+                if (IS_ERR(av)) {
+                        if (PTR_ERR(av) == -EEXIST)
+                                ubi_err(ubi, "volume (ID %i) already exists",
+                                        fmvhdr->vol_id);
+
                         goto fail_bad;
                 }
 
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index bd4a5e8ce441..ca16c5d7bab1 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -543,6 +543,14 @@ out:
 
         if (err != -ENOENT)
                 ubifs_err(c, "cannot find next direntry, error %d", err);
+        else
+                /*
+                 * -ENOENT is a non-fatal error in this context, the TNC uses
+                 * it to indicate that the cursor moved past the current directory
+                 * and readdir() has to stop.
+                 */
+                err = 0;
+
 
         /* 2 is a special value indicating that there are no more direntries */
         ctx->pos = 2;