From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Aug 2015 14:53:39 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/davinci-vcif', ... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7c0031360bd721254a52c56bd1c2e90b6d9df57b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/davinci-vcif', 'asoc/topic/doc' and 'asoc/topic/dpcm' into asoc-next
---

7c0031360bd721254a52c56bd1c2e90b6d9df57b
diff --cc sound/soc/soc-dapm.c
index 89e63166b50c,aa327c92480c,aa327c92480c,c4e3720bea41,aa327c92480c..f4bf21a5539b
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@@@@ -2568,13 -2602,14 -2602,14 -2602,14 -2602,14 +2568,13 @@@@@@ static int snd_soc_dapm_add_path(struc
     	}
     
     	list_add(&path->list, &dapm->card->paths);
 ----	list_add(&path->list_sink, &wsink->sources);
 ----	list_add(&path->list_source, &wsource->sinks);
 -- -
 -- -	dapm_update_widget_flags(wsource);
 -- -	dapm_update_widget_flags(wsink);
 ++++	snd_soc_dapm_for_each_direction(dir)
 ++++		list_add(&path->list_node[dir], &widgets[dir]->edges[dir]);
     
   - 	dapm_update_widget_flags(wsource);
   - 	dapm_update_widget_flags(wsink);
   - 
 ----	dapm_mark_dirty(wsource, "Route added");
 ----	dapm_mark_dirty(wsink, "Route added");
 ++++	snd_soc_dapm_for_each_direction(dir) {
 ++++		dapm_update_widget_flags(widgets[dir]);
 ++++		dapm_mark_dirty(widgets[dir], "Route added");
 ++++	}
     
     	if (dapm->card->instantiated && path->connect)
     		dapm_path_invalidate(path);