Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

1 files changed, 6 insertions, 3 deletions

diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c
index 958cb2a65a4e..d7300a1aa262 100644
--- a/sound/pci/emu10k1/voice.c
+++ b/sound/pci/emu10k1/voice.c
@@ -111,8 +111,10 @@ int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int number,
         unsigned long flags;
         int result;
 
-        snd_assert(rvoice != NULL, return -EINVAL);
-        snd_assert(number, return -EINVAL);
+        if (snd_BUG_ON(!rvoice))
+                return -EINVAL;
+        if (snd_BUG_ON(!number))
+                return -EINVAL;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
         for (;;) {
@@ -145,7 +147,8 @@ int snd_emu10k1_voice_free(struct snd_emu10k1 *emu,
 {
         unsigned long flags;
 
-        snd_assert(pvoice != NULL, return -EINVAL);
+        if (snd_BUG_ON(!pvoice))
+                return -EINVAL;
         spin_lock_irqsave(&emu->voice_lock, flags);
         pvoice->interrupt = NULL;
         pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;