diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
| commit | 6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch) | |
| tree | 2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /sound/pci/emu10k1/emu10k1.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/pci/emu10k1/emu10k1.c')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 8354c1a83312..c7f3b994101c 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
| @@ -114,9 +114,9 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci, | |||
| 114 | return -ENOENT; | 114 | return -ENOENT; |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 117 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 118 | if (card == NULL) | 118 | if (err < 0) |
| 119 | return -ENOMEM; | 119 | return err; |
| 120 | if (max_buffer_size[dev] < 32) | 120 | if (max_buffer_size[dev] < 32) |
| 121 | max_buffer_size[dev] = 32; | 121 | max_buffer_size[dev] = 32; |
| 122 | else if (max_buffer_size[dev] > 1024) | 122 | else if (max_buffer_size[dev] > 1024) |