diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 21:25:29 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 21:44:53 -0300 |
commit | a938b8c5be8fe5c28800c9cef4aa43d569aa57a8 (patch) | |
tree | 24aa36524bae8fe7a0e03e3fe61de6e263d628e2 /drivers/media | |
parent | f11ee73b0cca8a6c521cc4ac849a07ccf119fd1a (diff) | |
download | op-kernel-dev-a938b8c5be8fe5c28800c9cef4aa43d569aa57a8.zip op-kernel-dev-a938b8c5be8fe5c28800c9cef4aa43d569aa57a8.tar.gz |
cx231xx: Convert to snd_card_create()
Convert from snd_card_new() to the new snd_card_create() function.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-audio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c index 9ab0628..7793d60 100644 --- a/drivers/media/video/cx231xx/cx231xx-audio.c +++ b/drivers/media/video/cx231xx/cx231xx-audio.c @@ -478,9 +478,10 @@ static int cx231xx_audio_init(struct cx231xx *dev) cx231xx_info("cx231xx-audio.c: probing for cx231xx " "non standard usbaudio\n"); - card = snd_card_new(index[devnr], "Cx231xx Audio", THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[devnr], "Cx231xx Audio", THIS_MODULE, + 0, &card); + if (err < 0) + return err; spin_lock_init(&adev->slock); err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm); |