Patch "soundwire: stream: Add missing clear of alloc_slave_rt" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    soundwire: stream: Add missing clear of alloc_slave_rt

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     soundwire-stream-add-missing-clear-of-alloc_slave_rt.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 788e579e86cad36edc50a03e02afdf4c164b6aa4
Author: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jun 2 11:11:36 2023 +0100

    soundwire: stream: Add missing clear of alloc_slave_rt
    
    [ Upstream commit 58d95889f3c2064c6139ee94bb0e4d86e1ad4eab ]
    
    The current path that skips allocating the slave runtime does not clear
    the alloc_slave_rt flag, this is clearly incorrect. Add the missing
    clear, so the runtime won't be erroneously cleaned up.
    
    Fixes: f3016b891c8c ("soundwire: stream: sdw_stream_add_ functions can be called multiple times")
    Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
    Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230602101140.2040141-1-ckeepax@xxxxxxxxxxxxxxxxxxxxx
    Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index bd502368339e5..b10ea69a638e1 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -2019,8 +2019,10 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
 
 skip_alloc_master_rt:
 	s_rt = sdw_slave_rt_find(slave, stream);
-	if (s_rt)
+	if (s_rt) {
+		alloc_slave_rt = false;
 		goto skip_alloc_slave_rt;
+	}
 
 	s_rt = sdw_slave_rt_alloc(slave, m_rt);
 	if (!s_rt) {



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux