summaryrefslogtreecommitdiff
path: root/sound/firewire/fireface
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-01 18:01:00 +0300
committerTakashi Iwai <tiwai@suse.de>2019-07-01 18:01:55 +0300
commitb5c21c84705dbd96a0fff930d33022a17910b4f4 (patch)
treea080aa4383c8f4ffb91225d234ac9b530b2ff0fa /sound/firewire/fireface
parent7c2b3629d09ddec810dc4c1d3a6657c32def8f71 (diff)
parent7fbd1753b64eafe21cf842348a40a691d0dee440 (diff)
downloadlinux-b5c21c84705dbd96a0fff930d33022a17910b4f4.tar.xz
Merge branch 'for-linus' into for-next
This back-merge is necessary for adjusting the latest FireWire fix with the recent refactoring in 5.3 development branch. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/fireface')
-rw-r--r--sound/firewire/fireface/ff-protocol-latter.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/firewire/fireface/ff-protocol-latter.c b/sound/firewire/fireface/ff-protocol-latter.c
index 8d6ebb638e93..0e4c3a9ed5e4 100644
--- a/sound/firewire/fireface/ff-protocol-latter.c
+++ b/sound/firewire/fireface/ff-protocol-latter.c
@@ -9,11 +9,11 @@
#include "ff.h"
-#define LATTER_STF 0xffff00000004
-#define LATTER_ISOC_CHANNELS 0xffff00000008
-#define LATTER_ISOC_START 0xffff0000000c
-#define LATTER_FETCH_MODE 0xffff00000010
-#define LATTER_SYNC_STATUS 0x0000801c0000
+#define LATTER_STF 0xffff00000004ULL
+#define LATTER_ISOC_CHANNELS 0xffff00000008ULL
+#define LATTER_ISOC_START 0xffff0000000cULL
+#define LATTER_FETCH_MODE 0xffff00000010ULL
+#define LATTER_SYNC_STATUS 0x0000801c0000ULL
static int parse_clock_bits(u32 data, unsigned int *rate,
enum snd_ff_clock_src *src)