diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-08 11:12:47 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 05:46:40 -0400 |
commit | 5e246b850df563224be26f1d409cf66fd6c968df (patch) | |
tree | 970e7faf60b86cb2c489a08ca506075c398165e5 /sound/usb/usbmixer.c | |
parent | da3cec35dd3c31d8706db4bf379372ce70d92118 (diff) |
ALSA: Kill snd_assert() in other places
Kill snd_assert() in other places, either removed or replaced with
if () with snd_BUG_ON().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/usb/usbmixer.c')
-rw-r--r-- | sound/usb/usbmixer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index 5f98bee06959..6621fad8c5f0 100644 --- 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 | |||
1389 | struct usb_mixer_elem_info *cval = kcontrol->private_data; | 1389 | struct usb_mixer_elem_info *cval = kcontrol->private_data; |
1390 | char **itemlist = (char **)kcontrol->private_value; | 1390 | char **itemlist = (char **)kcontrol->private_value; |
1391 | 1391 | ||
1392 | snd_assert(itemlist, return -EINVAL); | 1392 | if (snd_BUG_ON(!itemlist)) |
1393 | return -EINVAL; | ||
1393 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 1394 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; |
1394 | uinfo->count = 1; | 1395 | uinfo->count = 1; |
1395 | uinfo->value.enumerated.items = cval->max; | 1396 | uinfo->value.enumerated.items = cval->max; |