diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2013-06-04 13:27:54 (GMT) |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-06-12 20:57:12 (GMT) |
| commit | 758b463d833f818a6416ad96d33c77267aab1afd (patch) | |
| tree | e3a6e6bfb675644f04a962bbcb4de4ac5e252eb0 /drivers | |
| parent | 594daba1bcb0510cdc9dccfbab9e6fd5d9cc94e6 (diff) | |
| download | linux-758b463d833f818a6416ad96d33c77267aab1afd.tar.xz | |
usb: gadget: f_mass_storage: fix default product name
If cfg->product name is not set, a default name is chosen depending
on the common->luns->cdrom flag. If the flag is set the name should
be "File-CD Gadget", and if the flag is not set the name should be
"File-Stor Gadget".
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index c35a9ec..56f1fd1 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -2747,8 +2747,8 @@ buffhds_first_it: "%-8s%-16s%04x", cfg->vendor_name ?: "Linux", /* Assume product name dependent on the first LUN */ cfg->product_name ?: (common->luns->cdrom - ? "File-Stor Gadget" - : "File-CD Gadget"), + ? "File-CD Gadget" + : "File-Stor Gadget"), i); /* |