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/parisc/harmony.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/parisc/harmony.c')
| -rw-r--r-- | sound/parisc/harmony.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 99f5483abf2e..41f870f8a11d 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
| @@ -868,7 +868,8 @@ snd_harmony_mixer_init(struct snd_harmony *h) | |||
| 868 | struct snd_card *card = h->card; | 868 | struct snd_card *card = h->card; |
| 869 | int idx, err; | 869 | int idx, err; |
| 870 | 870 | ||
| 871 | snd_assert(h != NULL, return -EINVAL); | 871 | if (snd_BUG_ON(!h)) |
| 872 | return -EINVAL; | ||
| 872 | strcpy(card->mixername, "Harmony Gain control interface"); | 873 | strcpy(card->mixername, "Harmony Gain control interface"); |
| 873 | 874 | ||
| 874 | for (idx = 0; idx < HARMONY_CONTROLS; idx++) { | 875 | for (idx = 0; idx < HARMONY_CONTROLS; idx++) { |