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/saa7134 | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'drivers/media/video/saa7134')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index c750d3dd57d2..8b0b64a89874 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
| @@ -990,10 +990,10 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) | |||
| 990 | if (!enable[devnum]) | 990 | if (!enable[devnum]) |
| 991 | return -ENODEV; | 991 | return -ENODEV; |
| 992 | 992 | ||
| 993 | card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, sizeof(snd_card_saa7134_t)); | 993 | err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, |
| 994 | 994 | sizeof(snd_card_saa7134_t), &card); | |
| 995 | if (card == NULL) | 995 | if (err < 0) |
| 996 | return -ENOMEM; | 996 | return err; |
| 997 | 997 | ||
| 998 | strcpy(card->driver, "SAA7134"); | 998 | strcpy(card->driver, "SAA7134"); |
| 999 | 999 | ||