summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2018-08-02 16:03:38 +0100
committerMark Brown <broonie@kernel.org>2018-08-02 17:19:46 +0100
commit611cbc8799b672f41b6ba7afed758ad9efb959a7 (patch)
treeece807cc68c4b00263802eae71480fa91c281630 /include/sound
parent62121debfb31a8700e387bd2987779b3a98bc520 (diff)
ASoC: core: remove support for card rebind using component framework
DRM based audio components get registered inside the component framework bind callback. However component framework has a big mutex lock taken for every call to component_add, component_del and bind, unbind callbacks. This can lead to deadlock situation if we are trying to add new/remove component within a bind/unbind callbacks. Which is what was happening with bcm2837 rpi 3. Revert this change till we sort out the mutex issue. Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com> Reported-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index ace474e8649e..41cec42fb456 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -17,7 +17,6 @@
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
-#include <linux/component.h>
#include <linux/regmap.h>
#include <linux/log2.h>
#include <sound/core.h>
@@ -1091,12 +1090,6 @@ struct snd_soc_card {
struct work_struct deferred_resume_work;
- /* component framework related */
- bool components_added;
- /* set in machine driver to enable/disable auto re-binding */
- bool auto_bind;
- struct component_match *match;
-
/* lists of probed devices belonging to this card */
struct list_head component_dev_list;