diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
| commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
| tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/pci/echoaudio/echoaudio.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/pci/echoaudio/echoaudio.c')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 8dbc5c4ba421..9d015a76eb69 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c | |||
| @@ -1997,9 +1997,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci, | |||
| 1997 | 1997 | ||
| 1998 | DE_INIT(("Echoaudio driver starting...\n")); | 1998 | DE_INIT(("Echoaudio driver starting...\n")); |
| 1999 | i = 0; | 1999 | i = 0; |
| 2000 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 2000 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 2001 | if (card == NULL) | 2001 | if (err < 0) |
| 2002 | return -ENOMEM; | 2002 | return err; |
| 2003 | 2003 | ||
| 2004 | snd_card_set_dev(card, &pci->dev); | 2004 | snd_card_set_dev(card, &pci->dev); |
| 2005 | 2005 | ||