summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2014-10-11 02:49:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-11 02:49:40 +0000
commit86b4dba9c48841659c566ac71a034230f02ec259 (patch)
tree903100545e7f3682ee8c5c21614dd62a739944c6 /toolbox
parent97e487311b1cb780dfd3b0994917c72047d6188f (diff)
parentb63aab58065f5fb2a04c5d7c49f1d61bf7e17179 (diff)
downloadsystem_core-86b4dba9c48841659c566ac71a034230f02ec259.zip
system_core-86b4dba9c48841659c566ac71a034230f02ec259.tar.gz
system_core-86b4dba9c48841659c566ac71a034230f02ec259.tar.bz2
am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once
* commit 'b63aab58065f5fb2a04c5d7c49f1d61bf7e17179': newfs_msdos: Set sectors per fat once
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/newfs_msdos.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/toolbox/newfs_msdos.c b/toolbox/newfs_msdos.c
index f69987c..01517fd 100644
--- a/toolbox/newfs_msdos.c
+++ b/toolbox/newfs_msdos.c
@@ -590,7 +590,9 @@ int newfs_msdos_main(int argc, char *argv[])
(bpb.spc * bpb.bps * NPB + fat / BPN * bpb.nft);
x2 = howmany((RESFTE + MIN(x, maxcls(fat))) * (fat / BPN), bpb.bps * NPB);
if (set_spf) {
- bpb.bspf = x2;
+ if (!bpb.bspf) {
+ bpb.bspf = x2;
+ }
x1 += (bpb.bspf - 1) * bpb.nft;
}
if(set_res) {