lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 051/862] ASoC: wcd934x: fix order of Slimbus unprepare/disable
    Date
    From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

    commit e96bca7eaa5747633ec638b065630ff83728982a upstream.

    Slimbus streams are first prepared and then enabled, so the cleanup path
    should reverse it. The unprepare sets stream->num_ports to 0 and frees
    the stream->ports. Calling disable after unprepare was not really
    effective (channels was not deactivated) and could lead to further
    issues due to making transfers on unprepared stream.

    Fixes: a61f3b4f476e ("ASoC: wcd934x: add support to wcd9340/wcd9341 codec")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
    Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Link: https://lore.kernel.org/r/20220921145354.1683791-2-krzysztof.kozlowski@linaro.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/codecs/wcd934x.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/sound/soc/codecs/wcd934x.c
    +++ b/sound/soc/codecs/wcd934x.c
    @@ -1913,8 +1913,8 @@ static int wcd934x_trigger(struct snd_pc
    case SNDRV_PCM_TRIGGER_STOP:
    case SNDRV_PCM_TRIGGER_SUSPEND:
    case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
    - slim_stream_unprepare(dai_data->sruntime);
    slim_stream_disable(dai_data->sruntime);
    + slim_stream_unprepare(dai_data->sruntime);
    break;
    default:
    break;

    \
     
     \ /
      Last update: 2022-10-19 10:44    [W:2.256 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site