lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 229/757] soundwire: stream: fix NULL/IS_ERR confusion
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit 3471d2a192bace106e4da7bcdcdd5ebcca4267d2 ]

    snd_soc_dai_get_sdw_stream() can only return -ENOTSUPP or the stream,
    NULL is not a possible value.

    Fixes: 4550569bd779f ('soundwire: stream: add helper to startup/shutdown streams')
    Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com>
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
    Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
    Link: https://lore.kernel.org/r/20200903204739.31206-2-yung-chuan.liao@linux.intel.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soundwire/stream.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
    index 6e36deb505b1e..610957f82b39c 100644
    --- a/drivers/soundwire/stream.c
    +++ b/drivers/soundwire/stream.c
    @@ -1913,7 +1913,7 @@ void sdw_shutdown_stream(void *sdw_substream)

    sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream);

    - if (!sdw_stream) {
    + if (IS_ERR(sdw_stream)) {
    dev_err(rtd->dev, "no stream found for DAI %s", dai->name);
    return;
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:10    [W:3.816 / U:1.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site