ALSA: Kill snd_assert() in sound/isa/*

[linux-2.6-omap-h63xx.git] / sound / isa / wavefront / wavefront_synth.c

diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 95eeca163354b5303b89554bdeafb8053bc54fcd..4c410820a994affcdc5f3ed448b8ad4e96343e06 100644 (file)
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1648,9 +1648,10 @@ snd_wavefront_synth_ioctl (struct snd_hwdep *hw, struct file *file,
 
        card = (struct snd_card *) hw->card;
 
-       snd_assert(card != NULL, return -ENODEV);
-
-       snd_assert(card->private_data != NULL, return -ENODEV);
+       if (snd_BUG_ON(!card))
+               return -ENODEV;
+       if (snd_BUG_ON(!card->private_data))
+               return -ENODEV;
 
        acard = card->private_data;
        dev = &acard->wavefront;
@@ -1939,7 +1940,7 @@ static int __devinit
 wavefront_download_firmware (snd_wavefront_t *dev, char *path)
 
 {
-       unsigned char *buf;
+       const unsigned char *buf;
        int len, err;
        int section_cnt_downloaded = 0;
        const struct firmware *firmware;