aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/es1688
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-08-08 17:11:45 +0200
committerJaroslav Kysela <perex@perex.cz>2008-08-13 11:46:36 +0200
commit622207dc31895b4e82c39100db8635d885c795e2 (patch)
treecbfd03ebe9caa2564924c76f2ca28bc348a68c87 /sound/isa/es1688
parent7eaa943c8ed8e91e05d0f5d0dc7a18e3319b45cf (diff)
downloadkernel_samsung_smdk4412-622207dc31895b4e82c39100db8635d885c795e2.zip
kernel_samsung_smdk4412-622207dc31895b4e82c39100db8635d885c795e2.tar.gz
kernel_samsung_smdk4412-622207dc31895b4e82c39100db8635d885c795e2.tar.bz2
ALSA: Kill snd_assert() in sound/isa/*
Kill snd_assert() in sound/isa/*, 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/isa/es1688')
-rw-r--r--sound/isa/es1688/es1688_lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 1e1e575..4fbb508 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -1009,7 +1009,8 @@ int snd_es1688_mixer(struct snd_es1688 *chip)
int err;
unsigned char reg, val;
- snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+ if (snd_BUG_ON(!chip || !chip->card))
+ return -EINVAL;
card = chip->card;