Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 18 Dec 2019 19:05:39 +0000 (20:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Dec 2019 19:07:43 +0000 (20:07 +0100)
Taking the 5.5 devel branch back into the main devel branch.
A USB-audio fix needs to be adjusted to adapt the changes that have
been formerly applied for stop_sync.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
sound/core/pcm_native.c
sound/pci/hda/hda_controller.c
sound/usb/pcm.c

Simple merge
Simple merge
diff --cc sound/usb/pcm.c
@@@ -1734,6 -1731,13 +1737,13 @@@ static int snd_usb_substream_playback_t
                subs->data_endpoint->retire_data_urb = retire_playback_urb;
                subs->running = 0;
                return 0;
 -                      stop_endpoints(subs, true);
+       case SNDRV_PCM_TRIGGER_SUSPEND:
+               if (subs->stream->chip->setup_fmt_after_resume_quirk) {
++                      stop_endpoints(subs);
+                       subs->need_setup_fmt = true;
+                       return 0;
+               }
+               break;
        }
  
        return -EINVAL;
@@@ -1766,6 -1770,13 +1776,13 @@@ static int snd_usb_substream_capture_tr
                subs->data_endpoint->retire_data_urb = retire_capture_urb;
                subs->running = 1;
                return 0;
 -                      stop_endpoints(subs, true);
+       case SNDRV_PCM_TRIGGER_SUSPEND:
+               if (subs->stream->chip->setup_fmt_after_resume_quirk) {
++                      stop_endpoints(subs);
+                       subs->need_setup_fmt = true;
+                       return 0;
+               }
+               break;
        }
  
        return -EINVAL;