diff options
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-alsa.c')
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-alsa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c index c6c9bd58f8be..554798dcedd0 100644 --- a/drivers/media/pci/cx23885/cx23885-alsa.c +++ b/drivers/media/pci/cx23885/cx23885-alsa.c | |||
@@ -489,7 +489,8 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev) | |||
489 | return NULL; | 489 | return NULL; |
490 | } | 490 | } |
491 | 491 | ||
492 | err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, | 492 | err = snd_card_new(&dev->pci->dev, |
493 | SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, | ||
493 | THIS_MODULE, sizeof(struct cx23885_audio_dev), &card); | 494 | THIS_MODULE, sizeof(struct cx23885_audio_dev), &card); |
494 | if (err < 0) | 495 | if (err < 0) |
495 | goto error; | 496 | goto error; |
@@ -500,8 +501,6 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev) | |||
500 | chip->card = card; | 501 | chip->card = card; |
501 | spin_lock_init(&chip->lock); | 502 | spin_lock_init(&chip->lock); |
502 | 503 | ||
503 | snd_card_set_dev(card, &dev->pci->dev); | ||
504 | |||
505 | err = snd_cx23885_pcm(chip, 0, "CX23885 Digital"); | 504 | err = snd_cx23885_pcm(chip, 0, "CX23885 Digital"); |
506 | if (err < 0) | 505 | if (err < 0) |
507 | goto error; | 506 | goto error; |