From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 18 Dec 2019 19:05:39 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v5.15~4528^2~192
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a032ff0e8065668e672eb2e223e265b7808f35a3;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' into for-next

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>
---

a032ff0e8065668e672eb2e223e265b7808f35a3
diff --cc sound/usb/pcm.c
index 8a52996,96298c7..0372f62
--- a/sound/usb/pcm.c
+++ b/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;
+ 	case SNDRV_PCM_TRIGGER_SUSPEND:
+ 		if (subs->stream->chip->setup_fmt_after_resume_quirk) {
 -			stop_endpoints(subs, true);
++			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;
+ 	case SNDRV_PCM_TRIGGER_SUSPEND:
+ 		if (subs->stream->chip->setup_fmt_after_resume_quirk) {
 -			stop_endpoints(subs, true);
++			stop_endpoints(subs);
+ 			subs->need_setup_fmt = true;
+ 			return 0;
+ 		}
+ 		break;
  	}
  
  	return -EINVAL;