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/es1688 | |
| 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/es1688')
| -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 | ||