aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gus_pcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/gus/gus_pcm.c')
-rw-r--r--sound/isa/gus/gus_pcm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 2dcf45bf7293..25f6788ccef3 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -849,7 +849,7 @@ static struct snd_pcm_ops snd_gf1_pcm_capture_ops = {
849 .pointer = snd_gf1_pcm_capture_pointer, 849 .pointer = snd_gf1_pcm_capture_pointer,
850}; 850};
851 851
852int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, struct snd_pcm ** rpcm) 852int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index)
853{ 853{
854 struct snd_card *card; 854 struct snd_card *card;
855 struct snd_kcontrol *kctl; 855 struct snd_kcontrol *kctl;
@@ -857,8 +857,6 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s
857 struct snd_pcm_substream *substream; 857 struct snd_pcm_substream *substream;
858 int capture, err; 858 int capture, err;
859 859
860 if (rpcm)
861 *rpcm = NULL;
862 card = gus->card; 860 card = gus->card;
863 capture = !gus->interwave && !gus->ess_flag && !gus->ace_flag ? 1 : 0; 861 capture = !gus->interwave && !gus->ess_flag && !gus->ace_flag ? 1 : 0;
864 err = snd_pcm_new(card, 862 err = snd_pcm_new(card,
@@ -903,8 +901,6 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s
903 return err; 901 return err;
904 kctl->id.index = control_index; 902 kctl->id.index = control_index;
905 903
906 if (rpcm)
907 *rpcm = pcm;
908 return 0; 904 return 0;
909} 905}
910 906