Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294644
b: refs/heads/master
c: 7eb3aa6
h: refs/heads/master
v: v3
  • Loading branch information
Artem Bityutskiy committed Mar 9, 2012
1 parent 243fbc1 commit c697cda
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: add8287e3fa2160229117c9e1b7c9ca8cb661423
refs/heads/master: 7eb3aa65853e1b223bfc786b023b702018cb76c0
10 changes: 4 additions & 6 deletions trunk/drivers/mtd/ubi/wl.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ static struct ubi_wl_entry *find_wl_entry(struct rb_root *root, int diff)
*/
int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
{
int err, medium_ec;
int err;
struct ubi_wl_entry *e, *first, *last;

ubi_assert(dtype == UBI_LONGTERM || dtype == UBI_SHORTTERM ||
Expand Down Expand Up @@ -428,7 +428,7 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
* For unknown data we pick a physical eraseblock with medium
* erase counter. But we by no means can pick a physical
* eraseblock with erase counter greater or equivalent than the
* lowest erase counter plus %WL_FREE_MAX_DIFF.
* lowest erase counter plus %WL_FREE_MAX_DIFF/2.
*/
first = rb_entry(rb_first(&ubi->free), struct ubi_wl_entry,
u.rb);
Expand All @@ -437,10 +437,8 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
if (last->ec - first->ec < WL_FREE_MAX_DIFF)
e = rb_entry(ubi->free.rb_node,
struct ubi_wl_entry, u.rb);
else {
medium_ec = (first->ec + WL_FREE_MAX_DIFF)/2;
e = find_wl_entry(&ubi->free, medium_ec);
}
else
e = find_wl_entry(&ubi->free, WL_FREE_MAX_DIFF/2);
break;
case UBI_SHORTTERM:
/*
Expand Down

0 comments on commit c697cda

Please sign in to comment.