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/sparc/cs4231.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/sparc/cs4231.c')
| -rw-r--r-- | sound/sparc/cs4231.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 727438d276eb..d44bf98e965e 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
| @@ -1543,7 +1543,8 @@ static int __init snd_cs4231_mixer(struct snd_card *card) | |||
| 1543 | struct snd_cs4231 *chip = card->private_data; | 1543 | struct snd_cs4231 *chip = card->private_data; |
| 1544 | int err, idx; | 1544 | int err, idx; |
| 1545 | 1545 | ||
| 1546 | snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL); | 1546 | if (snd_BUG_ON(!chip || !chip->pcm)) |
| 1547 | return -EINVAL; | ||
| 1547 | 1548 | ||
| 1548 | strcpy(card->mixername, chip->pcm->name); | 1549 | strcpy(card->mixername, chip->pcm->name); |
| 1549 | 1550 | ||