Volume: Don't crap out when dealing with unformatted cards

Change-Id: I2ab58328d07a343a5ec9e1c4b58f8258f0c9133c

diff --git a/Volume.cpp b/Volume.cpp
index 097626a..a38668b 100644 (file)
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -298,6 +298,13 @@ int Volume::formatVol(bool wipe) {
 
     fstype = getFsType((const char*)devicePath);
 
+    /* If the device has no filesystem, let's default to vfat.
+     * A NULL fstype will cause a MAPERR in the format
+     * switch below */
+    if (fstype == NULL) {
+        fstype = strdup("vfat");
+    }
+
     if (mDebug) {
         SLOGI("Formatting volume %s (%s) as %s", getLabel(), devicePath, fstype);
     }