diff options
| author | Ajay Agarwal <ajaya@codeaurora.org> | 2019-01-08 19:26:47 +0530 |
|---|---|---|
| committer | Ajay Agarwal <ajaya@codeaurora.org> | 2019-01-09 10:16:51 +0530 |
| commit | 4b641642761cdf220831ef416ff8a3ac8b581c89 (patch) | |
| tree | 2da51ea41b61ff29f2bc2a433093f2191ab7147d | |
| parent | 05dd6da5f6f1d57aae14d4b865d80e4ec7814175 (diff) | |
Revert "usb: gadget: u_audio: fix pcm/card naming in g_audio_setup()"
This reverts commit 2eb1ffe38317b32ff2498d00eb2aca3d3495c153.
Required for clean picking of UAC opensource changes.
Change-Id: If701e740b5fce8cc40de7832a87f13b2e36b329f
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
| -rw-r--r-- | drivers/usb/gadget/function/u_audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index 429d7928b7c9..3971bbab88bd 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -604,15 +604,15 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name, if (err < 0) goto snd_fail; - strlcpy(pcm->name, pcm_name, sizeof(pcm->name)); + strcpy(pcm->name, pcm_name); pcm->private_data = uac; uac->pcm = pcm; snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &uac_pcm_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &uac_pcm_ops); - strlcpy(card->driver, card_name, sizeof(card->driver)); - strlcpy(card->shortname, card_name, sizeof(card->shortname)); + strcpy(card->driver, card_name); + strcpy(card->shortname, card_name); sprintf(card->longname, "%s %i", card_name, card->dev->id); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, |