diff options
Diffstat (limited to 'sound/pci/sonicvibes.c')
-rw-r--r-- | sound/pci/sonicvibes.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 313a7328bf9c..34cee5c1abd8 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
@@ -880,8 +880,7 @@ static struct snd_pcm_ops snd_sonicvibes_capture_ops = { | |||
880 | .pointer = snd_sonicvibes_capture_pointer, | 880 | .pointer = snd_sonicvibes_capture_pointer, |
881 | }; | 881 | }; |
882 | 882 | ||
883 | static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device, | 883 | static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device) |
884 | struct snd_pcm **rpcm) | ||
885 | { | 884 | { |
886 | struct snd_pcm *pcm; | 885 | struct snd_pcm *pcm; |
887 | int err; | 886 | int err; |
@@ -902,8 +901,6 @@ static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device, | |||
902 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, | 901 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, |
903 | snd_dma_pci_data(sonic->pci), 64*1024, 128*1024); | 902 | snd_dma_pci_data(sonic->pci), 64*1024, 128*1024); |
904 | 903 | ||
905 | if (rpcm) | ||
906 | *rpcm = pcm; | ||
907 | return 0; | 904 | return 0; |
908 | } | 905 | } |
909 | 906 | ||
@@ -1491,7 +1488,7 @@ static int snd_sonic_probe(struct pci_dev *pci, | |||
1491 | (unsigned long long)pci_resource_start(pci, 1), | 1488 | (unsigned long long)pci_resource_start(pci, 1), |
1492 | sonic->irq); | 1489 | sonic->irq); |
1493 | 1490 | ||
1494 | if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) { | 1491 | if ((err = snd_sonicvibes_pcm(sonic, 0)) < 0) { |
1495 | snd_card_free(card); | 1492 | snd_card_free(card); |
1496 | return err; | 1493 | return err; |
1497 | } | 1494 | } |