1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00

ASoC: SOF: Correct sps->stream and cstream nullity

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

The Nullity of sps->cstream needs to be checked in sof_ipc_msg_data() and not
assume that it is not NULL.
The sps->stream must be cleared to NULL on close since this is used as a check
to see if we have active PCM stream.
This commit is contained in:
Mark Brown 2025-02-06 16:16:38 +00:00
commit 199b87f140
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 7 additions and 1 deletions

View file

@ -511,6 +511,8 @@ static int sof_pcm_close(struct snd_soc_component *component,
*/
}
spcm->stream[substream->stream].substream = NULL;
return 0;
}

View file

@ -43,7 +43,7 @@ int sof_ipc_msg_data(struct snd_sof_dev *sdev,
return -ESTRPIPE;
posn_offset = stream->posn_offset;
} else {
} else if (sps->cstream) {
struct sof_compr_stream *sstream = sps->cstream->runtime->private_data;
@ -51,6 +51,10 @@ int sof_ipc_msg_data(struct snd_sof_dev *sdev,
return -ESTRPIPE;
posn_offset = sstream->posn_offset;
} else {
dev_err(sdev->dev, "%s: No stream opened\n", __func__);
return -EINVAL;
}
snd_sof_dsp_mailbox_read(sdev, posn_offset, p, sz);