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/i2c/l3/uda1341.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/i2c/l3/uda1341.c')
| -rw-r--r-- | sound/i2c/l3/uda1341.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c index 1f4942ea1414..9840eb43648d 100644 --- a/sound/i2c/l3/uda1341.c +++ b/sound/i2c/l3/uda1341.c | |||
| @@ -771,7 +771,8 @@ int __init snd_chip_uda1341_mixer_new(struct snd_card *card, struct l3_client ** | |||
| 771 | struct l3_client *clnt; | 771 | struct l3_client *clnt; |
| 772 | int idx, err; | 772 | int idx, err; |
| 773 | 773 | ||
| 774 | snd_assert(card != NULL, return -EINVAL); | 774 | if (snd_BUG_ON(!card)) |
| 775 | return -EINVAL; | ||
| 775 | 776 | ||
| 776 | clnt = kzalloc(sizeof(*clnt), GFP_KERNEL); | 777 | clnt = kzalloc(sizeof(*clnt), GFP_KERNEL); |
| 777 | if (clnt == NULL) | 778 | if (clnt == NULL) |