summaryrefslogtreecommitdiffstats
path: root/flashrom.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-12-06 13:05:44 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-12-06 13:05:44 +0000
commit202bf5337dd0a23fcb7068077451c3f0f8cecb87 (patch)
tree2e0b0b42df6e9ca3593d12374d024c47b96a5dca /flashrom.c
parent9188240a14d77a1ceb5ab07e61a8d3c602e7995d (diff)
downloadast2050-flashrom-202bf5337dd0a23fcb7068077451c3f0f8cecb87.zip
ast2050-flashrom-202bf5337dd0a23fcb7068077451c3f0f8cecb87.tar.gz
Simplify get_next_write in the partial write code
Suggested by Michael Karcher. Corresponding to flashrom svn r1246. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'flashrom.c')
-rw-r--r--flashrom.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/flashrom.c b/flashrom.c
index ac39a5f..f3497d0 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -928,13 +928,11 @@ static int get_next_write(uint8_t *have, uint8_t *want, int len,
/* First location where have and want
* do not differ anymore.
*/
- first_len = i * stride - rel_start;
break;
}
}
}
- /* Did the loop terminate without setting first_len? */
- if (need_write && ! first_len)
+ if (need_write)
first_len = min(i * stride - rel_start, len);
*first_start += rel_start;
return first_len;
OpenPOWER on IntegriCloud