aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_controller.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-02-27 16:09:22 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-03 11:25:16 +0100
commit6efdd8513f182492c21fb7238592d4539d5c751a (patch)
treec399158c210875a0d5f235abf2b6154fc2a9bb13 /sound/pci/hda/hda_controller.c
parentALSA: hda - Split snd_hda_build_pcms() (diff)
downloadlinux-dev-6efdd8513f182492c21fb7238592d4539d5c751a.tar.xz
linux-dev-6efdd8513f182492c21fb7238592d4539d5c751a.zip
ALSA: hda - Add card field to hda_codec struct
Allow the codec object to have an individual card pointer. Not only this simplifies the redirections in many places, also this will allow us to make each codec assigned to a different card object. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_controller.c')
-rw-r--r--sound/pci/hda/hda_controller.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 1695f0e2bd9d..f50863a5159d 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -1898,7 +1898,7 @@ int azx_probe_codecs(struct azx *chip, unsigned int max_slots)
for (c = 0; c < max_slots; c++) {
if ((chip->codec_mask & (1 << c)) & chip->codec_probe_mask) {
struct hda_codec *codec;
- err = snd_hda_codec_new(bus, c, &codec);
+ err = snd_hda_codec_new(bus, bus->card, c, &codec);
if (err < 0)
continue;
codec->jackpoll_interval = get_jackpoll_interval(chip);