commit b63aab58065f5fb2a04c5d7c49f1d61bf7e17179
author Daniel Rosenberg <drosen@google.com> Sat Oct 11 00:23:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 11 00:23:52 2014 +0000
tree 6493530b06edaf52a095c57f76be882f27629c4d
parent 6f7fd39536b8d3dd7c0a5bbd9350e473e559ebff
parent 8218b6aae9cd4a19fa074a8a8203fe9275b35447

am 8218b6aa: newfs_msdos: Set sectors per fat once

* commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447':
  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) {