summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-05 10:36:28 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-05 10:36:28 +0100
commitd4a8da910e6db53d45ff76f7fdc584376de542df (patch)
treef94af5b586891834401469b3e90f64c8e4a2d171 /sound/soc
parentce3e3737a3361e0c7030f8598eec36bb82050de6 (diff)
parente655a43544bd3c45a83da93b00a4b115b4fa758e (diff)
downloadop-kernel-dev-d4a8da910e6db53d45ff76f7fdc584376de542df.zip
op-kernel-dev-d4a8da910e6db53d45ff76f7fdc584376de542df.tar.gz
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8940.c2
-rw-r--r--sound/soc/soc-dapm.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 914d788..1685cfb 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -790,7 +790,7 @@ static int wm8940_register(struct wm8940_priv *wm8940,
codec->reg_cache = &wm8940->reg_cache;
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);
return ret;
}
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 9babda5..8eaf1b6 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;
}
OpenPOWER on IntegriCloud