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/es1968.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/pci/es1968.c')
| -rw-r--r-- | sound/pci/es1968.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index e9c3794bbcb8..dc97e8116141 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
| @@ -2645,9 +2645,9 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci, | |||
| 2645 | return -ENOENT; | 2645 | return -ENOENT; |
| 2646 | } | 2646 | } |
| 2647 | 2647 | ||
| 2648 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 2648 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 2649 | if (!card) | 2649 | if (err < 0) |
| 2650 | return -ENOMEM; | 2650 | return err; |
| 2651 | 2651 | ||
| 2652 | if (total_bufsize[dev] < 128) | 2652 | if (total_bufsize[dev] < 128) |
| 2653 | total_bufsize[dev] = 128; | 2653 | total_bufsize[dev] = 128; |