diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-19 08:58:29 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-20 02:15:38 -0500 |
commit | 988d350aef30b798198e7915c574f82ba173f40f (patch) | |
tree | ffe7ffffdbd1655c8ab774167b653716de3fe431 /sound/usb/line6/playback.c | |
parent | aaa68d2f295147a7b648bbab632557c7429fb8cd (diff) |
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/playback.c')
-rw-r--r-- | sound/usb/line6/playback.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c index 258147eadf37..8fc2dedbeb52 100644 --- a/sound/usb/line6/playback.c +++ b/sound/usb/line6/playback.c | |||
@@ -490,9 +490,7 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd) | |||
490 | 490 | ||
491 | switch (cmd) { | 491 | switch (cmd) { |
492 | case SNDRV_PCM_TRIGGER_START: | 492 | case SNDRV_PCM_TRIGGER_START: |
493 | #ifdef CONFIG_PM | ||
494 | case SNDRV_PCM_TRIGGER_RESUME: | 493 | case SNDRV_PCM_TRIGGER_RESUME: |
495 | #endif | ||
496 | err = line6_pcm_acquire(line6pcm, | 494 | err = line6_pcm_acquire(line6pcm, |
497 | LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM); | 495 | LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM); |
498 | 496 | ||
@@ -502,9 +500,7 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd) | |||
502 | break; | 500 | break; |
503 | 501 | ||
504 | case SNDRV_PCM_TRIGGER_STOP: | 502 | case SNDRV_PCM_TRIGGER_STOP: |
505 | #ifdef CONFIG_PM | ||
506 | case SNDRV_PCM_TRIGGER_SUSPEND: | 503 | case SNDRV_PCM_TRIGGER_SUSPEND: |
507 | #endif | ||
508 | err = line6_pcm_release(line6pcm, | 504 | err = line6_pcm_release(line6pcm, |
509 | LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM); | 505 | LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM); |
510 | 506 | ||