ALSA: Kill snd_assert() in other places

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

diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 5f98bee06959adb709a269b90d16649555ed2897..6621fad8c5f0d2ebf721204615ace50386004976 100644 (file)
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -1389,7 +1389,8 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl
        struct usb_mixer_elem_info *cval = kcontrol->private_data;
        char **itemlist = (char **)kcontrol->private_value;
 
-       snd_assert(itemlist, return -EINVAL);
+       if (snd_BUG_ON(!itemlist))
+               return -EINVAL;
        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
        uinfo->count = 1;
        uinfo->value.enumerated.items = cval->max;