aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/bebob/bebob_stream.c3
-rw-r--r--sound/firewire/fireworks/fireworks_pcm.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c
index fbe938c79e3a..38aee3344a5d 100644
--- a/sound/firewire/bebob/bebob_stream.c
+++ b/sound/firewire/bebob/bebob_stream.c
@@ -852,7 +852,8 @@ static int
852seek_msu_sync_input_plug(struct snd_bebob *bebob) 852seek_msu_sync_input_plug(struct snd_bebob *bebob)
853{ 853{
854 u8 plugs[AVC_PLUG_INFO_BUF_BYTES], addr[AVC_BRIDGECO_ADDR_BYTES]; 854 u8 plugs[AVC_PLUG_INFO_BUF_BYTES], addr[AVC_BRIDGECO_ADDR_BYTES];
855 unsigned int i, type; 855 unsigned int i;
856 enum avc_bridgeco_plug_type type;
856 int err; 857 int err;
857 858
858 /* Get the number of Music Sub Unit for both direction. */ 859 /* Get the number of Music Sub Unit for both direction. */
diff --git a/sound/firewire/fireworks/fireworks_pcm.c b/sound/firewire/fireworks/fireworks_pcm.c
index ed211d062202..8a34753de210 100644
--- a/sound/firewire/fireworks/fireworks_pcm.c
+++ b/sound/firewire/fireworks/fireworks_pcm.c
@@ -195,8 +195,8 @@ end:
195static int pcm_open(struct snd_pcm_substream *substream) 195static int pcm_open(struct snd_pcm_substream *substream)
196{ 196{
197 struct snd_efw *efw = substream->private_data; 197 struct snd_efw *efw = substream->private_data;
198 int sampling_rate; 198 unsigned int sampling_rate;
199 unsigned int clock_source; 199 enum snd_efw_clock_source clock_source;
200 int err; 200 int err;
201 201
202 err = snd_efw_stream_lock_try(efw); 202 err = snd_efw_stream_lock_try(efw);