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>

diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index 97283e631e4522513727d5f013add02c9307c638..bad1b5b02786e00115d2bfc7f69cfaa0a68ebda7 100644 (file)
--- 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 ab9a83f0f8647d3d8895975c490b814437024fdb..7e031b1761aa1753241f68aba6e5d040f9d746e0 100644 (file)
--- 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)