diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/isa/sb/emu8000.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
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 | ||