summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai2005-04-20 13:45:55 +0200
committerJaroslav Kysela2005-05-29 10:04:58 +0200
commitd21b37ea134921f807ebdbd19ae3cd00bb8bf2fc (patch)
tree741a393951e7ec2767dec695cb0d9f665f28e287 /sound/pci/hda/hda_codec.c
parent[ALSA] Show PIN jack type (diff)
downloadkernel-qcow2-linux-d21b37ea134921f807ebdbd19ae3cd00bb8bf2fc.tar.gz
kernel-qcow2-linux-d21b37ea134921f807ebdbd19ae3cd00bb8bf2fc.tar.xz
kernel-qcow2-linux-d21b37ea134921f807ebdbd19ae3cd00bb8bf2fc.zip
[ALSA] Fix and cleanup of CM9880 auto-configuration
HDA Codec driver Fix and cleanup of CM9880 automatic PIN configuration. snd_hda_codec_setup_stream() doesn't do anything when NID is 0. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 890b7566154a..44fac2182fcc 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -549,6 +549,9 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stream_tag,
int channel_id, int format)
{
+ if (! nid)
+ return;
+
snd_printdd("hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
nid, stream_tag, channel_id, format);
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID,