]> git.baikalelectronics.ru Git - kernel.git/commit
ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
authorBoris Brezillon <boris.brezillon@free-electrons.com>
Fri, 28 Oct 2016 09:08:44 +0000 (11:08 +0200)
committerRichard Weinberger <richard@nod.at>
Fri, 28 Oct 2016 12:48:18 +0000 (14:48 +0200)
commit020613de96c225b49bbb66e588fac86f31e5c034
tree5c645b21a18ac218b16e70a2f22e3ccd7354cc1b
parentfe4c068b8ccf6938bea41fc7189a735f3147ce02
ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()

Commit 9b51c3a1b0a1 ("UBI: Fastmap: Do not add vol if it already
exists") introduced a bug by changing the possible error codes returned
by add_vol():
- this function no longer returns NULL in case of allocation failure
  but return ERR_PTR(-ENOMEM)
- when a duplicate entry in the volume RB tree is found it returns
  ERR_PTR(-EEXIST) instead of ERR_PTR(-EINVAL)

Fix the tests done on add_vol() return val to match this new behavior.

Fixes: 9b51c3a1b0a1 ("UBI: Fastmap: Do not add vol if it already exists")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Sheng Yong <shengyong1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
drivers/mtd/ubi/fastmap.c