diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-19 14:58:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-20 08:15:38 +0100 |
| commit | 988d350aef30b798198e7915c574f82ba173f40f (patch) | |
| tree | ffe7ffffdbd1655c8ab774167b653716de3fe431 /sound/usb/line6/capture.c | |
| parent | aaa68d2f295147a7b648bbab632557c7429fb8cd (diff) | |
| download | linux-988d350aef30b798198e7915c574f82ba173f40f.tar.gz linux-988d350aef30b798198e7915c574f82ba173f40f.tar.xz | |
ALSA: line6: Drop invalid SNDRV_PCM_INFO_RESUME flag
The line6 drivers don't support the full resume although they set
SNDRV_PCM_INFO_RESUME. These flags have to be dropped to inform
properly to the user-space.
Also, drop the CONFIG_PM in trigger callbacks, too, which are rather
superfluous.
Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6/capture.c')
| -rw-r--r-- | sound/usb/line6/capture.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c index 4cf6fa0541f1..1970ab57cb6f 100644 --- a/sound/usb/line6/capture.c +++ b/sound/usb/line6/capture.c @@ -342,9 +342,7 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd) switch (cmd) { case SNDRV_PCM_TRIGGER_START: -#ifdef CONFIG_PM case SNDRV_PCM_TRIGGER_RESUME: -#endif err = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM); @@ -354,9 +352,7 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd) break; case SNDRV_PCM_TRIGGER_STOP: -#ifdef CONFIG_PM case SNDRV_PCM_TRIGGER_SUSPEND: -#endif err = line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM); |