Skip to content

Commit c1e1739

Browse files
committed
ASoC: SOF: sof-client: Use event-handler mutex consistently
Protect IPC RX and FW state handler list unregister/dispatch paths with client_event_handler_mutex to match list registration and locking comments. Fixes: 5c19da3 ("ASoC: SOF: Use guard()/scoped_guard() for mutex locks where it makes sense") Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 2240389 commit c1e1739

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

sound/soc/sof/sof-client.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ void sof_client_unregister_ipc_rx_handler(struct sof_client_dev *cdev,
612612
struct snd_sof_dev *sdev = sof_client_dev_to_sof_dev(cdev);
613613
struct sof_ipc_event_entry *event;
614614

615-
guard(mutex)(&sdev->ipc_client_mutex);
615+
guard(mutex)(&sdev->client_event_handler_mutex);
616616

617617
list_for_each_entry(event, &sdev->ipc_rx_handler_list, list) {
618618
if (event->cdev == cdev && event->ipc_msg_type == ipc_msg_type) {
@@ -629,7 +629,7 @@ void sof_client_fw_state_dispatcher(struct snd_sof_dev *sdev)
629629
{
630630
struct sof_state_event_entry *event;
631631

632-
guard(mutex)(&sdev->ipc_client_mutex);
632+
guard(mutex)(&sdev->client_event_handler_mutex);
633633

634634
list_for_each_entry(event, &sdev->fw_state_handler_list, list)
635635
event->callback(event->cdev, sdev->fw_state);
@@ -664,7 +664,7 @@ void sof_client_unregister_fw_state_handler(struct sof_client_dev *cdev)
664664
struct snd_sof_dev *sdev = sof_client_dev_to_sof_dev(cdev);
665665
struct sof_state_event_entry *event;
666666

667-
guard(mutex)(&sdev->ipc_client_mutex);
667+
guard(mutex)(&sdev->client_event_handler_mutex);
668668

669669
list_for_each_entry(event, &sdev->fw_state_handler_list, list) {
670670
if (event->cdev == cdev) {

0 commit comments

Comments
 (0)