Commit 31469e8b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.9-rc7-2' of... 

Merge tag 'asoc-fix-v6.9-rc7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.9

A couple more minor fixes for ASoC, one incremental fix for earlier
issues and a minor formatting issue in the Makefile.
parents 87988a53 e54f128b

sound/soc/generic/audio-graph-card2.c

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ static int graph_count_c2c(struct simple_util_priv *priv, 
{

	struct device_node *ports = of_get_parent(lnk);

	struct device_node *port0 = lnk;

	struct device_node *port1 = of_get_next_child(ports, lnk);

	struct device_node *port1 = of_get_next_child(ports, of_node_get(lnk));

	struct device_node *ep0 = port_to_endpoint(port0);

	struct device_node *ep1 = port_to_endpoint(port1);

	struct device_node *codec0 = of_graph_get_remote_port(ep0);

sound/soc/sof/amd/Makefile

+4 −4

File changed.

Contains only whitespace changes.