lkml.org 
[lkml]   [2015]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19 03/75] ASoC: sn95031: Fix control-less DAPM routes
    Date
    3.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Lars-Peter Clausen <lars@metafoo.de>

    commit cdd3d2a93f08823a0b9802147dc28c99029dfdfd upstream.

    Routes without a control must use NULL for the control name. The sn95031
    driver uses "NULL" instead in a few places. Previous to commit 5fe5b767dc6f
    ("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets")
    the DAPM core silently ignored non-NULL controls on non-mixer and non-mux
    routes. But starting with that commit it will complain and not add the
    route breaking the sn95031 driver in the process.

    This patch replaces the incorrect "NULL" control name with NULL to fix the
    issue.

    Fixes: 5fe5b767dc6f ("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets")
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Acked-by: Vinod Koul <vinod.koul@intel.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/sound/soc/codecs/sn95031.c
    +++ b/sound/soc/codecs/sn95031.c
    @@ -531,8 +531,8 @@ static const struct snd_soc_dapm_route s
    /* speaker map */
    { "IHFOUTL", NULL, "Speaker Rail"},
    { "IHFOUTR", NULL, "Speaker Rail"},
    - { "IHFOUTL", "NULL", "Speaker Left Playback"},
    - { "IHFOUTR", "NULL", "Speaker Right Playback"},
    + { "IHFOUTL", NULL, "Speaker Left Playback"},
    + { "IHFOUTR", NULL, "Speaker Right Playback"},
    { "Speaker Left Playback", NULL, "Speaker Left Filter"},
    { "Speaker Right Playback", NULL, "Speaker Right Filter"},
    { "Speaker Left Filter", NULL, "IHFDAC Left"},



    \
     
     \ /
      Last update: 2015-04-10 16:21    [W:4.160 / U:0.560 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site