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/es1688/es1688_lib.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/es1688/es1688_lib.c')
| -rw-r--r-- | sound/isa/es1688/es1688_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index 1e1e575b1db3..4fbb508a817f 100644 --- a/sound/isa/es1688/es1688_lib.c +++ b/sound/isa/es1688/es1688_lib.c | |||
| @@ -1009,7 +1009,8 @@ int snd_es1688_mixer(struct snd_es1688 *chip) | |||
| 1009 | int err; | 1009 | int err; |
| 1010 | unsigned char reg, val; | 1010 | unsigned char reg, val; |
| 1011 | 1011 | ||
| 1012 | snd_assert(chip != NULL && chip->card != NULL, return -EINVAL); | 1012 | if (snd_BUG_ON(!chip || !chip->card)) |
| 1013 | return -EINVAL; | ||
| 1013 | 1014 | ||
| 1014 | card = chip->card; | 1015 | card = chip->card; |
| 1015 | 1016 | ||