summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-30 16:04:31 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-30 16:04:31 -0700
commit008dfbc55cf63f8af36f6b33c4635d30bf9e5e88 (patch)
treeeea23b50ede057bdfb202e2f8aeb7c134185fc45
parent5f638a12abb220a5cced4a1847885835ad51d856 (diff)
parent2d7a7965be7f11a2767e56e91637f0d74691e311 (diff)
Merge "f_audio_source: Use f_audiosource as first device name"
-rw-r--r--drivers/usb/gadget/function/f_audio_source.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_audio_source.c b/drivers/usb/gadget/function/f_audio_source.c
index ab7441fcf66f..46be62b737f1 100644
--- a/drivers/usb/gadget/function/f_audio_source.c
+++ b/drivers/usb/gadget/function/f_audio_source.c
@@ -1050,8 +1050,14 @@ static struct usb_function_instance *audio_source_alloc_inst(void)
config_group_init_type_name(&fi_audio->func_inst.group, "",
&audio_source_func_type);
- snprintf(device_name, AUDIO_SOURCE_DEV_NAME_LENGTH,
+ if (!count) {
+ snprintf(device_name, AUDIO_SOURCE_DEV_NAME_LENGTH,
+ "f_audio_source");
+ count++;
+ } else {
+ snprintf(device_name, AUDIO_SOURCE_DEV_NAME_LENGTH,
"f_audio_source%d", count++);
+ }
dev = create_function_device(device_name);