summaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-05-28 00:14:41 +0900
committerTakashi Iwai <tiwai@suse.de>2014-05-27 17:35:22 +0200
commita6b598bf4b4117597479cc0d6204df6d4d8f2635 (patch)
tree2e79ed3c5b28d60a962e7b552883fb590fc2718e /sound/firewire
parent4a286d55285fa865df3810f632bd5747dc6e8475 (diff)
downloadlinux-stable-a6b598bf4b4117597479cc0d6204df6d4d8f2635.tar.gz
linux-stable-a6b598bf4b4117597479cc0d6204df6d4d8f2635.tar.bz2
linux-stable-a6b598bf4b4117597479cc0d6204df6d4d8f2635.zip
ALSA: fireworks/bebob: Use the same type of variables as function parameters
The second argument of snd_efw_command_get_sampling_rate() means sampling rate and its type is 'unsigned int'. But 'int' variable is passed as parameter. It's better to apply the same type for the variable as its argument. Similally, the type of variable for snd_efw_command_get_clock_source() and avc_bridgeco_get_plug_type() should be the same type as each argument. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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
seek_msu_sync_input_plug(struct snd_bebob *bebob)
{
u8 plugs[AVC_PLUG_INFO_BUF_BYTES], addr[AVC_BRIDGECO_ADDR_BYTES];
- unsigned int i, type;
+ unsigned int i;
+ enum avc_bridgeco_plug_type type;
int err;
/* 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:
static int pcm_open(struct snd_pcm_substream *substream)
{
struct snd_efw *efw = substream->private_data;
- int sampling_rate;
- unsigned int clock_source;
+ unsigned int sampling_rate;
+ enum snd_efw_clock_source clock_source;
int err;
err = snd_efw_stream_lock_try(efw);