Merge branch 'topic/intel-lpe-audio' into for-next

2 files changed, 3 insertions, 3 deletions

diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index 8ce93cdc4b0d..00060c4a9deb 100644
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -69,7 +69,7 @@ static void pcm_period_tasklet(unsigned long data);
  * @protocol_size: the size to allocate newly for protocol
  */
 int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit,
-                      enum amdtp_stream_direction dir, int flags,
+                      enum amdtp_stream_direction dir, enum cip_flags flags,
                       unsigned int fmt,
                       amdtp_stream_process_data_blocks_t process_data_blocks,
                       unsigned int protocol_size)
diff --git a/sound/firewire/amdtp-stream.h b/sound/firewire/amdtp-stream.h
index 7be21429cd12..c1bc7fad056e 100644
--- a/sound/firewire/amdtp-stream.h
+++ b/sound/firewire/amdtp-stream.h
@@ -93,7 +93,7 @@ typedef unsigned int (*amdtp_stream_process_data_blocks_t)(
                                                 unsigned int *syt);
 struct amdtp_stream {
         struct fw_unit *unit;
-        int flags;
+        enum cip_flags flags;
         enum amdtp_stream_direction direction;
         struct mutex mutex;
 
@@ -137,7 +137,7 @@ struct amdtp_stream {
 };
 
 int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit,
-                      enum amdtp_stream_direction dir, int flags,
+                      enum amdtp_stream_direction dir, enum cip_flags flags,
                       unsigned int fmt,
                       amdtp_stream_process_data_blocks_t process_data_blocks,
                       unsigned int protocol_size);