Skip to content

Commit

Permalink
Merge pull request #183 from thinkski/master
Browse files Browse the repository at this point in the history
Fixed missing parenthesis. Resolves issues #92, #161, and #170.
  • Loading branch information
texane committed Oct 24, 2013
2 parents e40741e + c2e22f9 commit e35c818
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions flash/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ int main(int ac, char** av)
}
}
else if ((o.addr >= sl->sram_base) &&
(o.addr < sl->sram_base + sl->sram_size))
(o.addr < sl->sram_base + sl->sram_size)) {
err = stlink_fwrite_sram(sl, o.filename, o.addr);
if (err == -1)
{
printf("stlink_sram_flash() == -1\n");
goto on_error;
}
}
else if (o.cmd == DO_ERASE)
} else if (o.cmd == DO_ERASE)
{
err = stlink_erase_flash_mass(sl);
if (err == -1)
Expand Down

0 comments on commit e35c818

Please sign in to comment.