| commit | c28560a15463400a8589bae369892be9307c3fda | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sun May 04 05:50:07 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Sun May 04 05:50:07 2014 -0700 |
| tree | 5def2ec613e8b764a799bea7a2df85bd345e41b3 | |
| parent | 999bc211ddf5bb9640509dab5731a7e45cb28d5b [diff] | |
| parent | f3f14f72c147c2200b6a247dba366d906bbcb157 [diff] |
merge in master-release history after reset to 999bc211ddf5bb9640509dab5731a7e45cb28d5b
diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c index d598f03..a7daccc 100644 --- a/mkbootimg/mkbootimg.c +++ b/mkbootimg/mkbootimg.c
@@ -263,7 +263,7 @@ if(second_data) { if(write(fd, second_data, hdr.second_size) != hdr.second_size) goto fail; - if(write_padding(fd, pagesize, hdr.ramdisk_size)) goto fail; + if(write_padding(fd, pagesize, hdr.second_size)) goto fail; } return 0;