lkml.org 
[lkml]   [2012]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] UBI: Fastmap: Make sure that find_wl_entry() never returns NULL
    Date
    If the rbtree contains only one entry and we don't have fastmap
    on flash find_wl_entry() might return NULL.
    This must not happen.

    Signed-off-by: Richard Weinberger <richard@nod.at>
    ---
    drivers/mtd/ubi/wl.c | 3 ++-
    1 files changed, 2 insertions(+), 1 deletions(-)

    diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
    index 79e3257..d61672d 100644
    --- a/drivers/mtd/ubi/wl.c
    +++ b/drivers/mtd/ubi/wl.c
    @@ -376,7 +376,8 @@ static struct ubi_wl_entry *find_wl_entry(struct ubi_device *ubi,
    /* If no fastmap has been written and this WL entry can be used
    * as anchor PEB, hold it back and return the second best WL entry
    * such that fastmap can use the anchor PEB later. */
    - if (!ubi->fm_disabled && !ubi->fm && e->pnum < UBI_FM_MAX_START)
    + if (prev_e && !ubi->fm_disabled &&
    + !ubi->fm && e->pnum < UBI_FM_MAX_START)
    return prev_e;

    return e;
    --
    1.7.6.5


    \
     
     \ /
      Last update: 2012-07-09 15:01    [W:0.023 / U:29.544 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site