Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / sound / isa / sb / emu8000_patch.c

diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index 1be16c9700f09cd254117f3a0de9b014997de6f6..c99c6078be3376fa792f8b335e31f57a80a7c221 100644 (file)
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -156,7 +156,8 @@ snd_emu8000_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
        struct snd_emu8000 *emu;
 
        emu = rec->hw;
-       snd_assert(sp != NULL, return -EINVAL);
+       if (snd_BUG_ON(!sp))
+               return -EINVAL;
 
        if (sp->v.size == 0)
                return 0;