diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/synth/emux/emux_synth.c | |
parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/synth/emux/emux_synth.c')
-rw-r--r-- | sound/synth/emux/emux_synth.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c index 2cc6f6f79065..3e921b386fd5 100644 --- a/sound/synth/emux/emux_synth.c +++ b/sound/synth/emux/emux_synth.c | |||
@@ -956,7 +956,8 @@ void snd_emux_lock_voice(struct snd_emux *emu, int voice) | |||
956 | if (emu->voices[voice].state == SNDRV_EMUX_ST_OFF) | 956 | if (emu->voices[voice].state == SNDRV_EMUX_ST_OFF) |
957 | emu->voices[voice].state = SNDRV_EMUX_ST_LOCKED; | 957 | emu->voices[voice].state = SNDRV_EMUX_ST_LOCKED; |
958 | else | 958 | else |
959 | snd_printk("invalid voice for lock %d (state = %x)\n", | 959 | snd_printk(KERN_WARNING |
960 | "invalid voice for lock %d (state = %x)\n", | ||
960 | voice, emu->voices[voice].state); | 961 | voice, emu->voices[voice].state); |
961 | spin_unlock_irqrestore(&emu->voice_lock, flags); | 962 | spin_unlock_irqrestore(&emu->voice_lock, flags); |
962 | } | 963 | } |
@@ -973,7 +974,8 @@ void snd_emux_unlock_voice(struct snd_emux *emu, int voice) | |||
973 | if (emu->voices[voice].state == SNDRV_EMUX_ST_LOCKED) | 974 | if (emu->voices[voice].state == SNDRV_EMUX_ST_LOCKED) |
974 | emu->voices[voice].state = SNDRV_EMUX_ST_OFF; | 975 | emu->voices[voice].state = SNDRV_EMUX_ST_OFF; |
975 | else | 976 | else |
976 | snd_printk("invalid voice for unlock %d (state = %x)\n", | 977 | snd_printk(KERN_WARNING |
978 | "invalid voice for unlock %d (state = %x)\n", | ||
977 | voice, emu->voices[voice].state); | 979 | voice, emu->voices[voice].state); |
978 | spin_unlock_irqrestore(&emu->voice_lock, flags); | 980 | spin_unlock_irqrestore(&emu->voice_lock, flags); |
979 | } | 981 | } |