diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c index 8ada918a68..751c19c384 100644 --- a/util/flashrom/flashrom.c +++ b/util/flashrom/flashrom.c @@ -105,7 +105,7 @@ int map_flash_registers(struct flashchip *flash) size_t size = flash->total_size * 1024; registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, - fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); + fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); if (registers == MAP_FAILED) { perror("Can't mmap registers using " MEM_DEV); @@ -448,7 +448,8 @@ int main(int argc, char *argv[]) // //////////////////////////////////////////////////////////// if (exclude_end_position - exclude_start_position > 0) memcpy(buf + exclude_start_position, - (const char *)flash->virtual_memory + exclude_start_position, + (const char *)flash->virtual_memory + + exclude_start_position, exclude_end_position - exclude_start_position); exclude_start_page = exclude_start_position / flash->page_size; diff --git a/util/flashrom/sharplhf00l04.c b/util/flashrom/sharplhf00l04.c index 0eacd38577..61021d30ac 100644 --- a/util/flashrom/sharplhf00l04.c +++ b/util/flashrom/sharplhf00l04.c @@ -70,7 +70,7 @@ int probe_lhf00l04(struct flashchip *flash) printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); - if (id1 != flash->manufacture_id || id2 != flash->model_id) + if (id1 != flash->manufacture_id || id2 != flash->model_id) return 0; map_flash_registers(flash);