summaryrefslogtreecommitdiff
path: root/linux/sound/pci/bt87x.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-24 01:33:08 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-24 01:33:08 -0300
commit005392231f73c7f7781c04eebf5869c0174f503e (patch)
treea261d186361d85d130fe033cc63d575421800727 /linux/sound/pci/bt87x.c
parent59964b28e0205cdf0a4465194f40867b7c7f5aa6 (diff)
parent2da45c822154d03cd7db86ac11b52385f1fac384 (diff)
downloadmediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.gz
mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.bz2
merge: http://jusst.de/hg/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/sound/pci/bt87x.c')
-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)