diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:35 +0100 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /drivers/media/video/cx88 | |
| parent | Linux 2.6.29 (diff) | |
| parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
| download | linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.xz linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.zip | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'drivers/media/video/cx88')
| -rw-r--r-- | drivers/media/video/cx88/cx88-alsa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index 66c755c116dc..ce98d955231a 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c @@ -803,9 +803,10 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci, return (-ENOENT); } - card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t)); - if (!card) - return (-ENOMEM); + err = snd_card_create(index[devno], id[devno], THIS_MODULE, + sizeof(snd_cx88_card_t), &card); + if (err < 0) + return err; card->private_free = snd_cx88_dev_free; |