summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/eba.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-07-11 07:58:34 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-07-11 07:58:34 +0200
commit50543054eb23e9b93b5be4a272d130f04bf8bc4d (patch)
treec7f2dcc723ebcf287063c1699e5d87d54733a631 /drivers/mtd/ubi/eba.c
parente77acea709fb64b64ab884f5e946738d326df970 (diff)
parent2c310bd8a9e43e7023fbf7f0cebb2faaed9b03e0 (diff)
downloadbarebox-50543054eb23e9b93b5be4a272d130f04bf8bc4d.tar.gz
barebox-50543054eb23e9b93b5be4a272d130f04bf8bc4d.tar.xz
Merge branch 'for-next/ubi'
Diffstat (limited to 'drivers/mtd/ubi/eba.c')
-rw-r--r--drivers/mtd/ubi/eba.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index a7af247953..31dbcd29c3 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -257,16 +257,7 @@ static int leb_write_trylock(struct ubi_device *ubi, int vol_id, int lnum)
le = ltree_add_entry(ubi, vol_id, lnum);
if (IS_ERR(le))
return PTR_ERR(le);
-
- /* Contention, cancel */
- le->users -= 1;
- ubi_assert(le->users >= 0);
- if (le->users == 0) {
- rb_erase(&le->rb, &ubi->ltree);
- kfree(le);
- }
-
- return 1;
+ return 0;
}
/**