diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-18 12:04:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-18 12:04:23 +0000 |
| commit | 47325078f2a3e543150e7df967e45756b2fff7ec (patch) | |
| tree | 30a8e46009579d86c1402e2e870f20a8525f07d5 /sound | |
| parent | d4a6360f19c1c551afcba42be98df04651fab31b (diff) | |
| download | linux-47325078f2a3e543150e7df967e45756b2fff7ec.tar.gz linux-47325078f2a3e543150e7df967e45756b2fff7ec.tar.bz2 linux-47325078f2a3e543150e7df967e45756b2fff7ec.zip | |
ASoC: dapm: Make sure we have a card when displaying component widgets
The dummy component is reused for all cards so we special case and don't
bind it to any of them. This means that code like that displaying the
component widgets that tries to look at the card will crash. In the
future we will fix this by ensuring that the dummy component looks like
other components but that is invasive and so not suitable for a fix.
Instead add a special case check here.
Reported-by: Harry Pan <harry.pan@intel.com>
Suggested-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 801ae1a81dfd..c4464858bf01 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2188,6 +2188,13 @@ static ssize_t dapm_widget_show_component(struct snd_soc_component *cmpnt, int count = 0; char *state = "not set"; + /* card won't be set for the dummy component, as a spot fix + * we're checking for that case specifically here but in future + * we will ensure that the dummy component looks like others. + */ + if (!cmpnt->card) + return 0; + list_for_each_entry(w, &cmpnt->card->widgets, list) { if (w->dapm != dapm) continue; |