aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/pcxhr
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@alsa3.local>2008-12-28 16:44:30 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-12 15:20:55 +0100
commite58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 (patch)
treeb0c78267928d5a538b947f1f3f2247e4f63353b0 /sound/pci/pcxhr
parentc95eadd2f1afd2ba643e85a8dfc9079a3f03ae47 (diff)
downloadkernel_samsung_smdk4412-e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5.zip
kernel_samsung_smdk4412-e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5.tar.gz
kernel_samsung_smdk4412-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/pcxhr')
-rw-r--r--sound/pci/pcxhr/pcxhr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 27cf2c2..7f95459 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1510,12 +1510,12 @@ static int __devinit pcxhr_probe(struct pci_dev *pci,
snprintf(tmpid, sizeof(tmpid), "%s-%d",
id[dev] ? id[dev] : card_name, i);
- card = snd_card_new(idx, tmpid, THIS_MODULE, 0);
+ err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card);
- if (! card) {
+ if (err < 0) {
snd_printk(KERN_ERR "cannot allocate the card %d\n", i);
pcxhr_free(mgr);
- return -ENOMEM;
+ return err;
}
strcpy(card->driver, DRIVER_NAME);