diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:45 -0800 |
| commit | cba5a641ca7887dc371486681dac887869d1c7b7 (patch) | |
| tree | 0f083cfdec8c72657ccf90c2bab3f288027b68bf /sound/pci/echoaudio/echoaudio.c | |
| parent | 9f6632d6290785caf9e9f874c0a0cfaf2c178e59 (diff) | |
| parent | 6185af1f4254a53563fe6d6af652f5775fc70e25 (diff) | |
| download | linux-3.10-cba5a641ca7887dc371486681dac887869d1c7b7.tar.gz linux-3.10-cba5a641ca7887dc371486681dac887869d1c7b7.tar.bz2 linux-3.10-cba5a641ca7887dc371486681dac887869d1c7b7.zip | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.14rc3
[ALSA] cmipci - Allow to disable integrated FM port
[ALSA] hda-codec - Fix logic error in headphone mute for Conexant codecs
[ALSA] hda-codec - Add missing Mic Boost for AD1986A codec
[ALSA] ac97 - Add Thinkpad X31 and R40 to AD1981x blacklist
[ALSA] Add missing sysfs device assignment for ALSA PCI drivers
[ALSA] hda-codec - Define pin configs for MacBooks
[ALSA] hda-codec - Add missing Mic Boost controls for ALC262
[ALSA] soc - WM9712 PCM volume
[ALSA] soc - Fix WM9712 register cache entry
[ALSA] hda-codec - Add method for configuring Mac Pro without PCI SSID
[ALSA] hda-codec - Add LFE support on Dell M90
Diffstat (limited to 'sound/pci/echoaudio/echoaudio.c')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 6a428b81dba..e413da00759 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2033,6 +2033,8 @@ static int __devinit snd_echo_probe(struct pci_dev *pci, if (card == NULL) return -ENOMEM; + snd_card_set_dev(card, &pci->dev); + if ((err = snd_echo_create(card, pci, &chip)) < 0) { snd_card_free(card); return err; |