diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /drivers/media/video/cx88 | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
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, | |||
| 803 | return (-ENOENT); | 803 | return (-ENOENT); |
| 804 | } | 804 | } |
| 805 | 805 | ||
| 806 | card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t)); | 806 | err = snd_card_create(index[devno], id[devno], THIS_MODULE, |
| 807 | if (!card) | 807 | sizeof(snd_cx88_card_t), &card); |
| 808 | return (-ENOMEM); | 808 | if (err < 0) |
| 809 | return err; | ||
| 809 | 810 | ||
| 810 | card->private_free = snd_cx88_dev_free; | 811 | card->private_free = snd_cx88_dev_free; |
| 811 | 812 | ||