Skip to content

fixup! ASoC: SOF: sof-audio: Add support for loopback capture #5634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ranj063 wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
Open

fixup! ASoC: SOF: sof-audio: Add support for loopback capture #5634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions sound/soc/sof/sof-audio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static int sof_set_up_same_dir_widget_routes(struct snd_sof_dev *sdev,
* to check if the direction_valid is set for one of the widgets as all widgets will have
* the direction set in topology if one is set.
*/
if (sink_widget->spipe->direction_valid &&
if (sink_widget->spipe && sink_widget->spipe->direction_valid &&
!sof_widget_in_same_direction(sink_widget, src_widget->spipe->direction))
return 0;

Expand Down Expand Up @@ -416,7 +416,7 @@ static int sof_setup_pipeline_connections(struct snd_sof_dev *sdev,
* is set.
*/
if (src_widget && sink_widget &&
src_widget->spipe->direction_valid &&
src_widget->spipe && src_widget->spipe->direction_valid &&
sof_widget_in_same_direction(sink_widget, src_widget->spipe->direction))
continue;
}
Expand Down Expand Up @@ -446,7 +446,8 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg
if (!swidget)
goto sink_unprepare;

if (swidget->spipe->direction_valid && !sof_widget_in_same_direction(swidget, dir))
if (swidget->spipe && swidget->spipe->direction_valid &&
!sof_widget_in_same_direction(swidget, dir))
return;

/* skip widgets in use, those already unprepared or aggregated DAIs */
Expand Down Expand Up @@ -497,7 +498,8 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget
if (!widget_ops)
return 0;

if (swidget->spipe->direction_valid && !sof_widget_in_same_direction(swidget, dir))
if (swidget->spipe && swidget->spipe->direction_valid &&
!sof_widget_in_same_direction(swidget, dir))
return 0;

/* skip widgets already prepared or aggregated DAI widgets*/
Expand Down Expand Up @@ -561,7 +563,8 @@ static int sof_free_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dap
if (!swidget)
goto sink_free;

if (swidget->spipe->direction_valid && !sof_widget_in_same_direction(swidget, dir))
if (swidget->spipe && swidget->spipe->direction_valid &&
!sof_widget_in_same_direction(swidget, dir))
return 0;

/* skip aggregated DAIs */
Expand Down Expand Up @@ -611,7 +614,8 @@ static int sof_set_up_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_d
if (swidget) {
int i;

if (swidget->spipe->direction_valid && !sof_widget_in_same_direction(swidget, dir))
if (swidget->spipe && swidget->spipe->direction_valid &&
!sof_widget_in_same_direction(swidget, dir))
return 0;

/* skip aggregated DAIs */
Expand Down
Loading