Merge tag 'upstream-4.9-rc3' of git://git.infradead.org/linux-ubifs

Pull ubi/ubifs fixes from Richard Weinberger:
 "This contains fixes for issues in both UBI and UBIFS:

   - A regression wrt overlayfs, introduced in -rc2.
   - An UBI issue, found by Dan Carpenter's static checker"

* tag 'upstream-4.9-rc3' of git://git.infradead.org/linux-ubifs:
  ubifs: Fix regression in ubifs_readdir()
  ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()

1 files changed, 5 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;
                 }