Merge branch 'master' into for-upstream

[karo-tx-linux.git] / sound / core / seq / seq_prioq.c

diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c
index 074418617ee9f1dabacde501b9d45e37cdff6a3d..0101a8b99b7325650b7b4ccb758aac26366815aa 100644 (file)
--- a/sound/core/seq/seq_prioq.c
+++ b/sound/core/seq/seq_prioq.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -154,8 +153,8 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f,
        int count;
        int prior;
 
-       snd_assert(f, return -EINVAL);
-       snd_assert(cell, return -EINVAL);
+       if (snd_BUG_ON(!f || !cell))
+               return -EINVAL;
        
        /* check flags */
        prior = (cell->event.flags & SNDRV_SEQ_PRIORITY_MASK);