diff options
author | Roger Quadros <roger.quadros@nokia.com> | 2011-04-05 11:36:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 19:40:59 -0400 |
commit | 3c624d4962a583516acadcbf60a8ca2a48421f5c (patch) | |
tree | 85d60787a7287c2dd3260027026c963680c38f5d | |
parent | 73ee4da994e7b97bd8241e39099cf3dd94675d79 (diff) |
usb: gadget: f_mass_storage: If 'ro'/'cdrom' specified, open file as read-only
If we don't need Write access then attempt to open backing file in Read Only
mode instead of bailing out too soon.
Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index e9de33d1c9a0..7d95a2cf58a3 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c | |||
@@ -2757,6 +2757,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, | |||
2757 | for (i = 0, lcfg = cfg->luns; i < nluns; ++i, ++curlun, ++lcfg) { | 2757 | for (i = 0, lcfg = cfg->luns; i < nluns; ++i, ++curlun, ++lcfg) { |
2758 | curlun->cdrom = !!lcfg->cdrom; | 2758 | curlun->cdrom = !!lcfg->cdrom; |
2759 | curlun->ro = lcfg->cdrom || lcfg->ro; | 2759 | curlun->ro = lcfg->cdrom || lcfg->ro; |
2760 | curlun->initially_ro = curlun->ro; | ||
2760 | curlun->removable = lcfg->removable; | 2761 | curlun->removable = lcfg->removable; |
2761 | curlun->dev.release = fsg_lun_release; | 2762 | curlun->dev.release = fsg_lun_release; |
2762 | curlun->dev.parent = &gadget->dev; | 2763 | curlun->dev.parent = &gadget->dev; |