diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-24 12:12:45 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-24 12:12:45 -0700 |
| commit | 926dc5d76de0a9d2aa241277e1550716fceb401b (patch) | |
| tree | 64534ec27043adf94738535d634063f31935805c | |
| parent | 28af635af5d7a4c817dc0cd013fbcfe1f366dc5d (diff) | |
| parent | 2c31cd8e8be2a717c924ccac47b052bc13c02f55 (diff) | |
Merge "USB: f_audio_source: Use different names for multi instances"
| -rw-r--r-- | drivers/usb/gadget/function/f_audio_source.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_audio_source.c b/drivers/usb/gadget/function/f_audio_source.c index db7903d19c43..a2a9185a0143 100644 --- a/drivers/usb/gadget/function/f_audio_source.c +++ b/drivers/usb/gadget/function/f_audio_source.c @@ -989,6 +989,7 @@ static ssize_t audio_source_pcm_show(struct device *dev, struct device *create_function_device(char *name); +#define AUDIO_SOURCE_DEV_NAME_LENGTH 20 static struct usb_function_instance *audio_source_alloc_inst(void) { struct audio_source_instance *fi_audio; @@ -997,6 +998,8 @@ static struct usb_function_instance *audio_source_alloc_inst(void) struct device *dev; void *err_ptr; int err = 0; + char device_name[AUDIO_SOURCE_DEV_NAME_LENGTH]; + static u8 count; fi_audio = kzalloc(sizeof(*fi_audio), GFP_KERNEL); if (!fi_audio) @@ -1014,7 +1017,11 @@ static struct usb_function_instance *audio_source_alloc_inst(void) config_group_init_type_name(&fi_audio->func_inst.group, "", &audio_source_func_type); - dev = create_function_device("f_audio_source"); + + snprintf(device_name, AUDIO_SOURCE_DEV_NAME_LENGTH, + "f_audio_source%d", count++); + + dev = create_function_device(device_name); if (IS_ERR(dev)) { err_ptr = dev; |