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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 0 deletions

diff --git a/sound/usb/card.h b/sound/usb/card.h
index 1febf2f23754..ae4251d5abf7 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -62,12 +62,14 @@ struct snd_usb_substream {
         unsigned int syncinterval;  /* P for adaptive mode, 0 otherwise */
         unsigned int freqn;      /* nominal sampling rate in fs/fps in Q16.16 format */
         unsigned int freqm;      /* momentary sampling rate in fs/fps in Q16.16 format */
+        int          freqshift;  /* how much to shift the feedback value to get Q16.16 */
         unsigned int freqmax;    /* maximum sampling rate, used for buffer management */
         unsigned int phase;      /* phase accumulator */
         unsigned int maxpacksize;       /* max packet size in bytes */
         unsigned int maxframesize;      /* max packet size in frames */
         unsigned int curpacksize;       /* current packet size in bytes (for capture) */
         unsigned int curframesize;      /* current packet size in frames (for capture) */
+        unsigned int syncmaxsize;       /* sync endpoint packet size */
         unsigned int fill_max: 1;       /* fill max packet size always */
         unsigned int txfr_quirk:1;      /* allow sub-frame alignment */
         unsigned int fmt_type;          /* USB audio format type (1-3) */