diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-05 10:36:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-05 10:36:28 +0100 |
| commit | d4a8da910e6db53d45ff76f7fdc584376de542df (patch) | |
| tree | f94af5b586891834401469b3e90f64c8e4a2d171 /sound/soc/soc-dapm.c | |
| parent | ce3e3737a3361e0c7030f8598eec36bb82050de6 (diff) | |
| parent | e655a43544bd3c45a83da93b00a4b115b4fa758e (diff) | |
| download | linux-d4a8da910e6db53d45ff76f7fdc584376de542df.tar.gz linux-d4a8da910e6db53d45ff76f7fdc584376de542df.tar.bz2 linux-d4a8da910e6db53d45ff76f7fdc584376de542df.zip | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9babda559c92..8eaf1b6e7ef2 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -524,7 +524,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget) /* connected jack or spk ? */ if (widget->id == snd_soc_dapm_hp || widget->id == snd_soc_dapm_spk || - widget->id == snd_soc_dapm_line) + (widget->id == snd_soc_dapm_line && !list_empty(&widget->sources))) return 1; } @@ -573,7 +573,8 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget) return 1; /* connected jack ? */ - if (widget->id == snd_soc_dapm_mic || widget->id == snd_soc_dapm_line) + if (widget->id == snd_soc_dapm_mic || + (widget->id == snd_soc_dapm_line && !list_empty(&widget->sinks))) return 1; } |