ALSA: Kill snd_assert() in other places

[linux-2.6-omap-h63xx.git] / sound / usb / usbaudio.c

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index b8cfb7c2276872a05f40a07a0ed57d0b57357e8e..c91f18cdc8b5a0141c64f6eb71fb0c26908b5460 100644 (file)
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -841,7 +841,8 @@ static int start_urbs(struct snd_usb_substream *subs, struct snd_pcm_runtime *ru
                return -EBADFD;
 
        for (i = 0; i < subs->nurbs; i++) {
-               snd_assert(subs->dataurb[i].urb, return -EINVAL);
+               if (snd_BUG_ON(!subs->dataurb[i].urb))
+                       return -EINVAL;
                if (subs->ops.prepare(subs, runtime, subs->dataurb[i].urb) < 0) {
                        snd_printk(KERN_ERR "cannot prepare datapipe for urb %d\n", i);
                        goto __error;
@@ -849,7 +850,8 @@ static int start_urbs(struct snd_usb_substream *subs, struct snd_pcm_runtime *ru
        }
        if (subs->syncpipe) {
                for (i = 0; i < SYNC_URBS; i++) {
-                       snd_assert(subs->syncurb[i].urb, return -EINVAL);
+                       if (snd_BUG_ON(!subs->syncurb[i].urb))
+                               return -EINVAL;
                        if (subs->ops.prepare_sync(subs, runtime, subs->syncurb[i].urb) < 0) {
                                snd_printk(KERN_ERR "cannot prepare syncpipe for urb %d\n", i);
                                goto __error;
@@ -1321,10 +1323,12 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
        int err;
 
        iface = usb_ifnum_to_if(dev, fmt->iface);
-       snd_assert(iface, return -EINVAL);
+       if (WARN_ON(!iface))
+               return -EINVAL;
        alts = &iface->altsetting[fmt->altset_idx];
        altsd = get_iface_desc(alts);
-       snd_assert(altsd->bAlternateSetting == fmt->altsetting, return -EINVAL);
+       if (WARN_ON(altsd->bAlternateSetting != fmt->altsetting))
+               return -EINVAL;
 
        if (fmt == subs->cur_audiofmt)
                return 0;