PCI hotplug: pciehp: message refinement

[linux-2.6-omap-h63xx.git] / sound / isa / sb / emu8000.c

diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index 4eea84cfd4f4b703b5e6dd6f5bb86f230e091ae2..96678d5d3834863fbfe440df54b8170cfa088095 100644 (file)
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -20,7 +20,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
@@ -1024,7 +1023,8 @@ snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
 {
        int i, err = 0;
 
-       snd_assert(emu != NULL && card != NULL, return -EINVAL);
+       if (snd_BUG_ON(!emu || !card))
+               return -EINVAL;
 
        spin_lock_init(&emu->control_lock);