diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 11:32:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 11:32:17 +0200 |
| commit | 206855c321adee56db3946ca09a5887cddb9d598 (patch) | |
| tree | 13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /sound/sparc/cs4231.c | |
| parent | e8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 (diff) | |
| parent | cb58ffc3889f0545628f138f849e759a331b8ddc (diff) | |
Merge branch 'x86/urgent' into core/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'sound/sparc/cs4231.c')
| -rw-r--r-- | sound/sparc/cs4231.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 1c4797be72e..791d2fb821d 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -1560,7 +1560,8 @@ static int __init snd_cs4231_mixer(struct snd_card *card) struct snd_cs4231 *chip = card->private_data; int err, idx; - snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL); + if (snd_BUG_ON(!chip || !chip->pcm)) + return -EINVAL; strcpy(card->mixername, chip->pcm->name); |