diff options
author | Takashi Iwai <tiwai@alsa3.local> | 2008-12-28 10:44:30 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-12 09:20:55 -0500 |
commit | e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 (patch) | |
tree | b0c78267928d5a538b947f1f3f2247e4f63353b0 /sound/pci/emu10k1 | |
parent | c95eadd2f1afd2ba643e85a8dfc9079a3f03ae47 (diff) |
ALSA: Convert to snd_card_create() in sound/pci/*
Convert from snd_card_new() to the new snd_card_create() function
in sound/pci/*.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 6 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 6 |
2 files changed, 6 insertions, 6 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) |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 5ff4dbb62dad..31542adc6b7e 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -1544,9 +1544,9 @@ static int __devinit snd_emu10k1x_probe(struct pci_dev *pci, | |||
1544 | return -ENOENT; | 1544 | return -ENOENT; |
1545 | } | 1545 | } |
1546 | 1546 | ||
1547 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 1547 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
1548 | if (card == NULL) | 1548 | if (err < 0) |
1549 | return -ENOMEM; | 1549 | return err; |
1550 | 1550 | ||
1551 | if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) { | 1551 | if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) { |
1552 | snd_card_free(card); | 1552 | snd_card_free(card); |