Commit ab5cdcba authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Drop voodoo workarounds 



If the problem still really remains, we should fix it instead of
papering over it like this...

Tested-by: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9fb754b7

sound/usb/line6/capture.c

+0 −12
Original line number Diff line number Diff line
@@ -297,18 +297,6 @@ static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream, 
	int ret;

	struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);



	/* -- Florian Demski [FD] */

	/* don't ask me why, but this fixes the bug on my machine */

	if (line6pcm == NULL) {

		if (substream->pcm == NULL)

			return -ENOMEM;

		if (substream->pcm->private_data == NULL)

			return -ENOMEM;

		substream->private_data = substream->pcm->private_data;

		line6pcm = snd_pcm_substream_chip(substream);

	}

	/* -- [FD] end */



	ret = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_BUFFER);



	if (ret < 0)

sound/usb/line6/playback.c

+0 −12
Original line number Diff line number Diff line
@@ -445,18 +445,6 @@ static int snd_line6_playback_hw_params(struct snd_pcm_substream *substream, 
	int ret;

	struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);



	/* -- Florian Demski [FD] */

	/* don't ask me why, but this fixes the bug on my machine */

	if (line6pcm == NULL) {

		if (substream->pcm == NULL)

			return -ENOMEM;

		if (substream->pcm->private_data == NULL)

			return -ENOMEM;

		substream->private_data = substream->pcm->private_data;

		line6pcm = snd_pcm_substream_chip(substream);

	}

	/* -- [FD] end */



	ret = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_BUFFER);



	if (ret < 0)