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>
This commit is contained in:
Andrzej Pietrasiewicz 2013-06-04 15:27:54 +02:00 committed by Felipe Balbi
parent 594daba1bc
commit 758b463d83

View File

@ -2747,8 +2747,8 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
"%-8s%-16s%04x", cfg->vendor_name ?: "Linux", "%-8s%-16s%04x", cfg->vendor_name ?: "Linux",
/* Assume product name dependent on the first LUN */ /* Assume product name dependent on the first LUN */
cfg->product_name ?: (common->luns->cdrom cfg->product_name ?: (common->luns->cdrom
? "File-Stor Gadget" ? "File-CD Gadget"
: "File-CD Gadget"), : "File-Stor Gadget"),
i); i);
/* /*