diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 12:11:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 12:11:09 +0100 |
| commit | 2a0f5cb32772e9a9560209e241a80bfbbc31dbc3 (patch) | |
| tree | a56fc2cdcd1e4a091373c330c751b6c3c3cb9cac | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
| parent | e655a43544bd3c45a83da93b00a4b115b4fa758e (diff) | |
| download | linux-2a0f5cb32772e9a9560209e241a80bfbbc31dbc3.tar.gz linux-2a0f5cb32772e9a9560209e241a80bfbbc31dbc3.tar.bz2 linux-2a0f5cb32772e9a9560209e241a80bfbbc31dbc3.zip | |
Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.32
| -rw-r--r-- | sound/soc/codecs/wm8940.c | 2 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index da97aae475a2..1ef2454c5205 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 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) /* 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; } |