Merge branch 'for-2.6.32' into for-2.6.33

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;
         }