commit 9011c1bc7ab1a666d00dbe0330ff411691cb4f42
author Daniel Rosenberg <drosen@google.com> Sat Oct 11 04:55:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 11 04:55:01 2014 +0000
tree e1ef24b0f40e5828b68f8881cd0bd33e44a1cedb
parent a1ab5a8ecf4fe806732e9ecec0c471a7a7329ea9
parent 86b4dba9c48841659c566ac71a034230f02ec259

am 86b4dba9: am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once

* commit '86b4dba9c48841659c566ac71a034230f02ec259':
  newfs_msdos: Set sectors per fat once

toolbox/newfs_msdos.c

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 @@
                 (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) {