usb: gadget: f_mass_storage: change default value of the removable parameter

This commit changes the default value of the removable module parameter
from “y” to “n”.  This comes with line with file_storag's default and
seems to be a better default.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index f67b453740bd..72116fa49ffb 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -124,7 +124,7 @@
  *                              backing storage.
  *      ro=b[,b...]     Default false, boolean for read-only access.
  *      removable=b[,b...]
- *                      Default true, boolean for removable media.
+ *                      Default false, boolean for removable media.
  *      cdrom=b[,b...]  Default false, boolean for whether to emulate
  *                              a CD-ROM drive.
  *      nofua=b[,b...]  Default false, booleans for ignore FUA flag
@@ -3167,8 +3167,7 @@ fsg_config_from_params(struct fsg_config *cfg,
         for (i = 0, lun = cfg->luns; i < cfg->nluns; ++i, ++lun) {
                 lun->ro = !!params->ro[i];
                 lun->cdrom = !!params->cdrom[i];
-                lun->removable = /* Removable by default */
-                        params->removable_count <= i || params->removable[i];
+                lun->removable = !!params->removable[i];
                 lun->filename =
                         params->file_count > i && params->file[i][0]
                         ? params->file[i]
@@ -3203,4 +3202,3 @@ fsg_common_from_params(struct fsg_common *common,
         fsg_config_from_params(&cfg, params);
         return fsg_common_init(common, cdev, &cfg);
 }
-