diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /sound/isa/sb/emu8000.c | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'sound/isa/sb/emu8000.c')
| -rw-r--r-- | sound/isa/sb/emu8000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index b35be7d9a9fa..96678d5d3834 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c | |||
| @@ -1023,7 +1023,8 @@ snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu) | |||
| 1023 | { | 1023 | { |
| 1024 | int i, err = 0; | 1024 | int i, err = 0; |
| 1025 | 1025 | ||
| 1026 | snd_assert(emu != NULL && card != NULL, return -EINVAL); | 1026 | if (snd_BUG_ON(!emu || !card)) |
| 1027 | return -EINVAL; | ||
| 1027 | 1028 | ||
| 1028 | spin_lock_init(&emu->control_lock); | 1029 | spin_lock_init(&emu->control_lock); |
| 1029 | 1030 | ||