projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.30' into for-2.6.31
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
sound
/
isa
/
gus
/
gus_mixer.c
diff --git
a/sound/isa/gus/gus_mixer.c
b/sound/isa/gus/gus_mixer.c
index
ebdb334
..
0dd4341
100644
(file)
--- a/
sound/isa/gus/gus_mixer.c
+++ b/
sound/isa/gus/gus_mixer.c
@@
-161,9
+161,11
@@
int snd_gf1_new_mixer(struct snd_gus_card * gus)
unsigned int idx, max;
int err;
unsigned int idx, max;
int err;
- snd_assert(gus != NULL, return -EINVAL);
+ if (snd_BUG_ON(!gus))
+ return -EINVAL;
card = gus->card;
card = gus->card;
- snd_assert(card != NULL, return -EINVAL);
+ if (snd_BUG_ON(!card))
+ return -EINVAL;
if (gus->ics_flag)
snd_component_add(card, "ICS2101");
if (gus->ics_flag)
snd_component_add(card, "ICS2101");