diff options
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 f79711b9fa5b..8de6f9dec4a2 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) | |||
| 524 | 524 | ||
| 525 | /* connected jack or spk ? */ | 525 | /* connected jack or spk ? */ |
| 526 | if (widget->id == snd_soc_dapm_hp || widget->id == snd_soc_dapm_spk || | 526 | if (widget->id == snd_soc_dapm_hp || widget->id == snd_soc_dapm_spk || |
| 527 | widget->id == snd_soc_dapm_line) | 527 | (widget->id == snd_soc_dapm_line && !list_empty(&widget->sources))) |
| 528 | return 1; | 528 | return 1; |
| 529 | } | 529 | } |
| 530 | 530 | ||
| @@ -573,7 +573,8 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget) | |||
| 573 | return 1; | 573 | return 1; |
| 574 | 574 | ||
| 575 | /* connected jack ? */ | 575 | /* connected jack ? */ |
| 576 | if (widget->id == snd_soc_dapm_mic || widget->id == snd_soc_dapm_line) | 576 | if (widget->id == snd_soc_dapm_mic || |
| 577 | (widget->id == snd_soc_dapm_line && !list_empty(&widget->sinks))) | ||
| 577 | return 1; | 578 | return 1; |
| 578 | } | 579 | } |
| 579 | 580 | ||
