summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/f_mass_storage.c
diff options
context:
space:
mode:
authorMichal Nazarewicz <mina86@mina86.com>2012-05-26 16:32:39 -0700
committerFelipe Balbi <balbi@ti.com>2012-06-04 18:11:35 +0300
commitfa84c57516f6da93ebc2601348043e9bcb7b4b4d (patch)
tree3e6e5362d18c7adf813890153204b8705bdad58b /drivers/usb/gadget/f_mass_storage.c
parent338edabcd879320f0f86cc701161b95277be6b5d (diff)
downloadop-kernel-dev-fa84c57516f6da93ebc2601348043e9bcb7b4b4d.zip
op-kernel-dev-fa84c57516f6da93ebc2601348043e9bcb7b4b4d.tar.gz
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>
Diffstat (limited to 'drivers/usb/gadget/f_mass_storage.c')
-rw-r--r--drivers/usb/gadget/f_mass_storage.c6
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 f67b453..72116fa 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);
}
-
OpenPOWER on IntegriCloud