projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
mtd
/
ubi
/
wl.c
diff --git
a/drivers/mtd/ubi/wl.c
b/drivers/mtd/ubi/wl.c
index
17ec948
..
959c7b1
100644
(file)
--- a/
drivers/mtd/ubi/wl.c
+++ b/
drivers/mtd/ubi/wl.c
@@
-1534,6
+1534,7
@@
int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
INIT_LIST_HEAD(&ubi->pq[i]);
ubi->pq_head = 0;
+ ubi->free_count = 0;
list_for_each_entry_safe(aeb, tmp, &ai->erase, u.list) {
cond_resched();
@@
-1552,7
+1553,6
@@
int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
found_pebs++;
}
- ubi->free_count = 0;
list_for_each_entry(aeb, &ai->free, u.list) {
cond_resched();