TBM/tbm-mcu
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ftl: fix order of preliminary checks

Browse source
This commit is contained in:
S.J.R. van Schaik 2017-05-26 16:08:50 +02:00
parent acc18a5253
commit 631cc1e33a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/ftl/ftl.c
View file

@ -25,6 +25,11 @@ size_t ftl_read(struct ftl_map *map, void *data, size_t len, uint32_t va)
int ret; int ret;
uint32_t mask, offset, page; uint32_t mask, offset, page;
if (!data)
return 0;
len = min(len, (1 << map->log2_page_size) - offset);
mask = ((1 << map->log2_page_size) - 1); mask = ((1 << map->log2_page_size) - 1);
offset = va & mask; offset = va & mask;
va >>= map->log2_page_size; va >>= map->log2_page_size;
@ -34,11 +39,6 @@ size_t ftl_read(struct ftl_map *map, void *data, size_t len, uint32_t va)
return len; return len;
} }
if (!data)
return 0;
len = min(len, (1 << map->log2_page_size) - offset);
return flash_read(map->dev, (page << map->log2_page_size) + offset, data, return flash_read(map->dev, (page << map->log2_page_size) + offset, data,
len); len);
} }