summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-14 13:32:57 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-14 13:32:57 -0300
commit7d87c22b2c2af68c8e1a59119ee752cfdec2e7fb (patch)
treea243130a7a8c0e0cb8133fc905366d467b16eeba
parent015736e16a8af8a8fe96379031c6a637f4f3a1cb (diff)
downloadmediapointer-dvb-s2-7d87c22b2c2af68c8e1a59119ee752cfdec2e7fb.tar.gz
mediapointer-dvb-s2-7d87c22b2c2af68c8e1a59119ee752cfdec2e7fb.tar.bz2
backport commit e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Takashi Iwai <tiwai@alsa3.local> Date: Sun Dec 28 16:44:30 2008 +0100 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: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/sound/pci/bt87x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 8b6868462..11b10d70e 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -914,9 +914,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
return -ENOENT;
}
- card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
- if (!card)
- return -ENOMEM;
+ err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+ if (err < 0)
+ return err;
err = snd_bt87x_create(card, pci, &chip);
if (err < 0)