diff options
| author | Richard Fitzgerald <rf@opensource.cirrus.com> | 2026-04-30 15:33:53 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2026-05-03 21:57:43 +0530 |
| commit | 9a0afdd19a01c6edddb92eb6a464f9e99d946b90 (patch) | |
| tree | f69d81ab61bf784ab3af343a72715c5a2d132508 | |
| parent | 254f49634ee16a731174d2ae34bc50bd5f45e731 (diff) | |
soundwire: stream: sdw_stream_remove_slave(): Check stream is valid
In sdw_stream_remove_slave() check that stream is a valid pointer
before passing it to functions that dereference it. Return 0 if the
pointer is invalid.
This is a convenience for callers. They can safely call this function
during cleanup code without needing a pointer validity check duplicated
at every call point.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20260430143353.2702714-1-rf@opensource.cirrus.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
| -rw-r--r-- | drivers/soundwire/stream.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 4ed8fb7663ad..c1ef177a0021 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -2229,11 +2229,15 @@ EXPORT_SYMBOL(sdw_stream_add_slave); * @slave: SDW Slave instance * @stream: SoundWire stream * - * This removes and frees port_rt and slave_rt from a stream + * This removes and frees port_rt and slave_rt from a stream. + * If stream is NULL or an ERR_PTR, do nothing and return 0. */ int sdw_stream_remove_slave(struct sdw_slave *slave, struct sdw_stream_runtime *stream) { + if (IS_ERR_OR_NULL(stream)) + return 0; + mutex_lock(&slave->bus->bus_lock); sdw_slave_port_free(slave, stream); |