Commit d4a8da91 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-2.6.32' into for-2.6.33

parents ce3e3737 e655a435
...@@ -790,7 +790,7 @@ static int wm8940_register(struct wm8940_priv *wm8940, ...@@ -790,7 +790,7 @@ static int wm8940_register(struct wm8940_priv *wm8940,
codec->reg_cache = &wm8940->reg_cache; codec->reg_cache = &wm8940->reg_cache;
ret = snd_soc_codec_set_cache_io(codec, 8, 16, control); ret = snd_soc_codec_set_cache_io(codec, 8, 16, control);
if (ret == 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
return ret; return ret;
} }
......
...@@ -524,7 +524,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget) ...@@ -524,7 +524,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget)
/* connected jack or spk ? */ /* connected jack or spk ? */
if (widget->id == snd_soc_dapm_hp || widget->id == snd_soc_dapm_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; return 1;
} }
...@@ -573,7 +573,8 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget) ...@@ -573,7 +573,8 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget)
return 1; return 1;
/* connected jack ? */ /* 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; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment