lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 354/453] ASoC: cx2072x: Fix doubly definitions of Playback and Capture streams
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 0d024a8bec084205fdd9fa17479ba91f45f85db3 upstream.

    The cx2072x codec driver defines multiple DAIs with the same stream
    name "Playback" and "Capture". Although the current code works more
    or less as is as the secondary streams are never used, it still leads
    the error message like:
    debugfs: File 'Playback' in directory 'dapm' already present!
    debugfs: File 'Capture' in directory 'dapm' already present!

    Fix it by renaming the secondary streams to unique names.

    Fixes: a497a4363706 ("ASoC: Add support for Conexant CX2072X CODEC")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Link: https://lore.kernel.org/r/20201208135154.9188-1-tiwai@suse.de
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/codecs/cx2072x.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/soc/codecs/cx2072x.c
    +++ b/sound/soc/codecs/cx2072x.c
    @@ -1579,7 +1579,7 @@ static struct snd_soc_dai_driver soc_cod
    .id = CX2072X_DAI_DSP,
    .probe = cx2072x_dsp_dai_probe,
    .playback = {
    - .stream_name = "Playback",
    + .stream_name = "DSP Playback",
    .channels_min = 2,
    .channels_max = 2,
    .rates = CX2072X_RATES_DSP,
    @@ -1591,7 +1591,7 @@ static struct snd_soc_dai_driver soc_cod
    .name = "cx2072x-aec",
    .id = 3,
    .capture = {
    - .stream_name = "Capture",
    + .stream_name = "AEC Capture",
    .channels_min = 2,
    .channels_max = 2,
    .rates = CX2072X_RATES_DSP,

    \
     
     \ /
      Last update: 2020-12-28 14:55    [W:4.314 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site