Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 1 deletions

diff --git a/sound/usb/proc.c b/sound/usb/proc.c
index f5e3f356b95f..961c9a250686 100644
--- a/sound/usb/proc.c
+++ b/sound/usb/proc.c
@@ -107,7 +107,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s
                         }
                         snd_iprintf(buffer, "\n");
                 }
-                if (snd_usb_get_speed(subs->dev) == USB_SPEED_HIGH)
+                if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL)
                         snd_iprintf(buffer, "    Data packet interval: %d us\n",
                                     125 * (1 << fp->datainterval));
                 // snd_iprintf(buffer, "    Max Packet Size = %d\n", fp->maxpacksize);
@@ -132,6 +132,11 @@ static void proc_dump_substream_status(struct snd_usb_substream *subs, struct sn
                             ? get_full_speed_hz(subs->freqm)
                             : get_high_speed_hz(subs->freqm),
                             subs->freqm >> 16, subs->freqm & 0xffff);
+                if (subs->freqshift != INT_MIN)
+                        snd_iprintf(buffer, "    Feedback Format = %d.%d\n",
+                                    (subs->syncmaxsize > 3 ? 32 : 24)
+                                                - (16 - subs->freqshift),
+                                    16 - subs->freqshift);
         } else {
                 snd_iprintf(buffer, "  Status: Stop\n");
         }