summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-23 14:12:13 (GMT)
committerTakashi Iwai <tiwai@suse.de>2015-01-28 06:21:12 (GMT)
commitab5cdcbab2efb833b4c199d0b0a6603af080eaa2 (patch)
tree12e098b773ad20c120b17cf8c5a43eb3170c2f8c
parent9fb754b79e536eb35d69a4678687addff589e45b (diff)
downloadlinux-ab5cdcbab2efb833b4c199d0b0a6603af080eaa2.tar.xz
ALSA: line6: Drop voodoo workarounds
If the problem still really remains, we should fix it instead of papering over it like this... Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/line6/capture.c12
-rw-r--r--sound/usb/line6/playback.c12
2 files changed, 0 insertions, 24 deletions
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index 97283e6..bad1b5b 100644
--- a/sound/usb/line6/capture.c
+++ b/sound/usb/line6/capture.c
@@ -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)
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index ab9a83f..7e031b1 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -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)