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/sb_common.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/sb_common.c')
| -rw-r--r-- | sound/isa/sb/sb_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index b432d9ae874..27a65150225 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
| @@ -219,7 +219,8 @@ int snd_sbdsp_create(struct snd_card *card, | |||
| 219 | .dev_free = snd_sbdsp_dev_free, | 219 | .dev_free = snd_sbdsp_dev_free, |
| 220 | }; | 220 | }; |
| 221 | 221 | ||
| 222 | snd_assert(r_chip != NULL, return -EINVAL); | 222 | if (snd_BUG_ON(!r_chip)) |
| 223 | return -EINVAL; | ||
| 223 | *r_chip = NULL; | 224 | *r_chip = NULL; |
| 224 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | 225 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 225 | if (chip == NULL) | 226 | if (chip == NULL) |