diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /sound/synth/emux/emux_oss.c | |
| parent | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (diff) | |
| parent | 34e51ce60a210094bd66cf0a75dd8512247618ca (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/synth/emux/emux_oss.c')
| -rw-r--r-- | sound/synth/emux/emux_oss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c index 5c47b6c09264..87e42206c4ef 100644 --- a/sound/synth/emux/emux_oss.c +++ b/sound/synth/emux/emux_oss.c | |||
| @@ -132,7 +132,7 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) | |||
| 132 | p = snd_emux_create_port(emu, tmpname, 32, | 132 | p = snd_emux_create_port(emu, tmpname, 32, |
| 133 | 1, &callback); | 133 | 1, &callback); |
| 134 | if (p == NULL) { | 134 | if (p == NULL) { |
| 135 | snd_printk("can't create port\n"); | 135 | snd_printk(KERN_ERR "can't create port\n"); |
| 136 | snd_emux_dec_count(emu); | 136 | snd_emux_dec_count(emu); |
| 137 | mutex_unlock(&emu->register_mutex); | 137 | mutex_unlock(&emu->register_mutex); |
| 138 | return -ENOMEM; | 138 | return -ENOMEM; |