diff options
| author |   Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
| commit | 970259bff472579204108c6f27036ec4d1206ae1 (patch) | |
| tree | 869bdcda9aac4c67712d93e6141056fdf3f41bd8 /drivers/mtd/ubi/fastmap.c | |
| parent | ARM: OMAP2+: remove custom abort handler for t410 (diff) | |
| parent | arm: omap2+: add missing HWMOD_NO_IDLEST in 81xx hwmod data (diff) | |
| download | linux-dev-970259bff472579204108c6f27036ec4d1206ae1.tar.xz linux-dev-970259bff472579204108c6f27036ec4d1206ae1.zip | |
Merge branch '81xx' into omap-for-v4.4/fixes
Diffstat (limited to 'drivers/mtd/ubi/fastmap.c')
| -rw-r--r-- | drivers/mtd/ubi/fastmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 4aa2fd8633e7..263b439e21a8 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -450,7 +450,7 @@ static void unmap_peb(struct ubi_attach_info *ai, int pnum) * < 0 indicates an internal error. */ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, - int *pebs, int pool_size, unsigned long long *max_sqnum, + __be32 *pebs, int pool_size, unsigned long long *max_sqnum, struct list_head *free) { struct ubi_vid_hdr *vh; @@ -775,7 +775,7 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, for (j = 0; j < be32_to_cpu(fm_eba->reserved_pebs); j++) { int pnum = be32_to_cpu(fm_eba->pnum[j]); - if ((int)be32_to_cpu(fm_eba->pnum[j]) < 0) + if (pnum < 0) continue; aeb = NULL; |