3 files changed, 10 insertions, 3 deletions

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 4a469f0cb6d4..561bb74fd364 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -646,6 +646,8 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
                         list_for_each(p, &chip->pcm_list) {
                                 as = list_entry(p, struct snd_usb_stream, list);
                                 snd_pcm_suspend_all(as->pcm);
+                                as->substream[0].need_setup_ep =
+                                        as->substream[1].need_setup_ep = true;
                         }
                 }
         } else {
diff --git a/sound/usb/card.h b/sound/usb/card.h
index 6cc883c3567d..afa4f9e9b27a 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -125,6 +125,7 @@ struct snd_usb_substream {
         struct snd_usb_endpoint *data_endpoint;
         struct snd_usb_endpoint *sync_endpoint;
         unsigned long flags;
+        bool need_setup_ep;             /* (re)configure EP at prepare? */
 
         u64 formats;                    /* format bitmasks (all or'ed) */
         unsigned int num_formats;               /* number of supported audio formats (list) */
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index ae783d40f55a..55e19e1b80ec 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -510,6 +510,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
 
         subs->interface = fmt->iface;
         subs->altset_idx = fmt->altset_idx;
+        subs->need_setup_ep = true;
 
         return 0;
 }
@@ -568,9 +569,12 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
         if (ret < 0)
                 return ret;
 
-        ret = configure_endpoint(subs);
-        if (ret < 0)
-                return ret;
+        if (subs->need_setup_ep) {
+                ret = configure_endpoint(subs);
+                if (ret < 0)
+                        return ret;
+                subs->need_setup_ep = false;
+        }
 
         /* some unit conversions in runtime */
         subs->data_endpoint->maxframesize =