summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_sysfs.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_sysfs.c
parentALSA: hda - Split snd_hda_build_pcms() (diff)
downloadlinux-6efdd8513f182492c21fb7238592d4539d5c751a.tar.xz
linux-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_sysfs.c')
-rw-r--r--sound/pci/hda/hda_sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c
index ccc962a1699f..e13c75d67847 100644
--- a/sound/pci/hda/hda_sysfs.c
+++ b/sound/pci/hda/hda_sysfs.c
@@ -149,7 +149,7 @@ static int reconfig_codec(struct hda_codec *codec)
err = snd_hda_codec_build_controls(codec);
if (err < 0)
goto error;
- err = snd_card_register(codec->bus->card);
+ err = snd_card_register(codec->card);
error:
snd_hda_power_down(codec);
return err;