diff options
Diffstat (limited to 'sound/pci/riptide/riptide.c')
-rw-r--r-- | sound/pci/riptide/riptide.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 6abc2ac8fffb..121f2c09d7a7 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -1706,14 +1706,11 @@ static struct snd_pcm_ops snd_riptide_capture_ops = { | |||
1706 | .pointer = snd_riptide_pointer, | 1706 | .pointer = snd_riptide_pointer, |
1707 | }; | 1707 | }; |
1708 | 1708 | ||
1709 | static int | 1709 | static int snd_riptide_pcm(struct snd_riptide *chip, int device) |
1710 | snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm) | ||
1711 | { | 1710 | { |
1712 | struct snd_pcm *pcm; | 1711 | struct snd_pcm *pcm; |
1713 | int err; | 1712 | int err; |
1714 | 1713 | ||
1715 | if (rpcm) | ||
1716 | *rpcm = NULL; | ||
1717 | if ((err = | 1714 | if ((err = |
1718 | snd_pcm_new(chip->card, "RIPTIDE", device, PLAYBACK_SUBSTREAMS, 1, | 1715 | snd_pcm_new(chip->card, "RIPTIDE", device, PLAYBACK_SUBSTREAMS, 1, |
1719 | &pcm)) < 0) | 1716 | &pcm)) < 0) |
@@ -1729,8 +1726,6 @@ snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm) | |||
1729 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, | 1726 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, |
1730 | snd_dma_pci_data(chip->pci), | 1727 | snd_dma_pci_data(chip->pci), |
1731 | 64 * 1024, 128 * 1024); | 1728 | 64 * 1024, 128 * 1024); |
1732 | if (rpcm) | ||
1733 | *rpcm = pcm; | ||
1734 | return 0; | 1729 | return 0; |
1735 | } | 1730 | } |
1736 | 1731 | ||
@@ -2092,7 +2087,7 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
2092 | if (err < 0) | 2087 | if (err < 0) |
2093 | goto error; | 2088 | goto error; |
2094 | card->private_data = chip; | 2089 | card->private_data = chip; |
2095 | err = snd_riptide_pcm(chip, 0, NULL); | 2090 | err = snd_riptide_pcm(chip, 0); |
2096 | if (err < 0) | 2091 | if (err < 0) |
2097 | goto error; | 2092 | goto error; |
2098 | err = snd_riptide_mixer(chip); | 2093 | err = snd_riptide_mixer(chip); |