diff options
author | Takashi Iwai <tiwai@alsa3.local> | 2008-12-28 16:44:30 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-12 15:20:55 +0100 |
commit | e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 (patch) | |
tree | b0c78267928d5a538b947f1f3f2247e4f63353b0 /sound/pci/emu10k1 | |
parent | c95eadd2f1afd2ba643e85a8dfc9079a3f03ae47 (diff) | |
download | kernel_samsung_crespo-e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5.zip kernel_samsung_crespo-e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5.tar.gz kernel_samsung_crespo-e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5.tar.bz2 |
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 8354c1a..c7f3b99 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, return -ENOENT; } - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; if (max_buffer_size[dev] < 32) max_buffer_size[dev] = 32; else if (max_buffer_size[dev] > 1024) diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 5ff4dbb..31542ad 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, return -ENOENT; } - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) { snd_card_free(card); |