ALSA: firewire-lib: change structure member with proper type

The 'amdtp_stream' structure is initialized by a call of
'amdtp_stream_init()'. Although a parameter of this function is for bit
flags of packet attributes, its type is enumerator.

This commit changes the type so that it's proper for a bit flags.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index 00060c4a9deb4ec239f34dc857ceebf75615d65c..8ce93cdc4b0d83475edd2badfdfc3b64858b93e9 100644 (file)
--- 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, enum cip_flags flags,
+                     enum amdtp_stream_direction dir, int 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 c1bc7fad056e82c62ee81e8f6a615f0a5d5fa85b..7be21429cd1214b339d2bba399458e837c5c262d 100644 (file)
--- 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;
-       enum cip_flags flags;
+       int 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, enum cip_flags flags,
+                     enum amdtp_stream_direction dir, int flags,
                      unsigned int fmt,
                      amdtp_stream_process_data_blocks_t process_data_blocks,
                      unsigned int protocol_size);