diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:25:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:53 -0400 |
commit | a938b8c5be8fe5c28800c9cef4aa43d569aa57a8 (patch) | |
tree | 24aa36524bae8fe7a0e03e3fe61de6e263d628e2 /drivers | |
parent | f11ee73b0cca8a6c521cc4ac849a07ccf119fd1a (diff) |
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')
-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 9ab0628b9a11..7793d60966db 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) | |||
478 | cx231xx_info("cx231xx-audio.c: probing for cx231xx " | 478 | cx231xx_info("cx231xx-audio.c: probing for cx231xx " |
479 | "non standard usbaudio\n"); | 479 | "non standard usbaudio\n"); |
480 | 480 | ||
481 | card = snd_card_new(index[devnr], "Cx231xx Audio", THIS_MODULE, 0); | 481 | err = snd_card_create(index[devnr], "Cx231xx Audio", THIS_MODULE, |
482 | if (card == NULL) | 482 | 0, &card); |
483 | return -ENOMEM; | 483 | if (err < 0) |
484 | return err; | ||
484 | 485 | ||
485 | spin_lock_init(&adev->slock); | 486 | spin_lock_init(&adev->slock); |
486 | err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm); | 487 | err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm); |