diff options
| author | Tom Rini <trini@ti.com> | 2013-11-08 15:25:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-08 15:25:29 -0500 |
| commit | 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f (patch) | |
| tree | 662fecd9e66cfe485097f777912824d81f9642e6 /drivers/dfu/dfu.c | |
| parent | 28c860b23fb2dd1affec909e98f25c58324e2140 (diff) | |
| parent | 47d79deb996797dddd0984cef8b48a566c82180e (diff) | |
| download | olio-uboot-2014.01-15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f.tar.xz olio-uboot-2014.01-15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-usb
Diffstat (limited to 'drivers/dfu/dfu.c')
| -rw-r--r-- | drivers/dfu/dfu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 4a8804e4b..1eb92e541 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -229,6 +229,7 @@ static int dfu_read_buffer_fill(struct dfu_entity *dfu, void *buf, int size) dfu->crc = crc32(dfu->crc, buf, chunk); dfu->i_buf += chunk; dfu->b_left -= chunk; + dfu->r_left -= chunk; size -= chunk; buf += chunk; readn += chunk; @@ -287,7 +288,7 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->offset = 0; dfu->i_buf_end = dfu_get_buf() + dfu_buf_size; dfu->i_buf = dfu->i_buf_start; - dfu->b_left = 0; + dfu->b_left = min(dfu_buf_size, dfu->r_left); dfu->bad_skip = 0; |