diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-27 16:09:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-03 11:25:16 +0100 |
| commit | 6efdd8513f182492c21fb7238592d4539d5c751a (patch) | |
| tree | c399158c210875a0d5f235abf2b6154fc2a9bb13 /sound/pci/hda/hda_bind.c | |
| parent | 1a4ba30cced3002add8459eadcd65b8d3cd1515e (diff) | |
| download | talos-obmc-linux-6efdd8513f182492c21fb7238592d4539d5c751a.tar.gz talos-obmc-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_bind.c')
| -rw-r--r-- | sound/pci/hda/hda_bind.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index ce2dd7b0dc07..2d00417494e2 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -287,9 +287,9 @@ int snd_hda_codec_configure(struct hda_codec *codec) } /* audio codec should override the mixer name */ - if (codec->afg || !*codec->bus->card->mixername) - snprintf(codec->bus->card->mixername, - sizeof(codec->bus->card->mixername), + if (codec->afg || !*codec->card->mixername) + snprintf(codec->card->mixername, + sizeof(codec->card->mixername), "%s %s", codec->vendor_name, codec->chip_name); return 0; |
