diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 12:35:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 12:37:32 +0200 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /sound/isa/wavefront/wavefront_synth.c | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'sound/isa/wavefront/wavefront_synth.c')
| -rw-r--r-- | sound/isa/wavefront/wavefront_synth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c index 0bb9b925660..4c410820a99 100644 --- a/sound/isa/wavefront/wavefront_synth.c +++ b/sound/isa/wavefront/wavefront_synth.c @@ -1648,9 +1648,10 @@ snd_wavefront_synth_ioctl (struct snd_hwdep *hw, struct file *file, card = (struct snd_card *) hw->card; - snd_assert(card != NULL, return -ENODEV); - - snd_assert(card->private_data != NULL, return -ENODEV); + if (snd_BUG_ON(!card)) + return -ENODEV; + if (snd_BUG_ON(!card->private_data)) + return -ENODEV; acard = card->private_data; dev = &acard->wavefront; |