summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai2009-02-12 00:14:34 +0100
committerTakashi Iwai2009-02-12 00:14:34 +0100
commita1152e3570e271dbf217391d549d3e47e258fe05 (patch)
treef3447447b2ccf22bba37f64c1a301b66f3984911 /sound
parentALSA: hda - Detect multiple digital-out pins (diff)
parentALSA: hda - Register (new) devices at reconfig (diff)
downloadkernel-qcow2-linux-a1152e3570e271dbf217391d549d3e47e258fe05.tar.gz
kernel-qcow2-linux-a1152e3570e271dbf217391d549d3e47e258fe05.tar.xz
kernel-qcow2-linux-a1152e3570e271dbf217391d549d3e47e258fe05.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_hwdep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 300ab407cf42..482fb0304ca9 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -175,7 +175,7 @@ static int reconfig_codec(struct hda_codec *codec)
err = snd_hda_codec_build_controls(codec);
if (err < 0)
return err;
- return 0;
+ return snd_card_register(codec->bus->card);
}
/*