2 files changed, 5 insertions, 2 deletions

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 4690b8b5681..e570649184e 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -692,6 +692,9 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer,
                 snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PVOLUME], left, right);
                 if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME)
                         snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right);
+        } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME) {
+                snd_mixer_oss_put_volume1_vol(fmixer, pslot,
+                        slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right);
         } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GVOLUME) {
                 snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GVOLUME], left, right);
         } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GLOBAL) {
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 0a1798eafb0..699d2890535 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2872,7 +2872,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
                         setup = kmalloc(sizeof(*setup), GFP_KERNEL);
                         if (! setup) {
                                 buffer->error = -ENOMEM;
-                                mutex_lock(&pstr->oss.setup_mutex);
+                                mutex_unlock(&pstr->oss.setup_mutex);
                                 return;
                         }
                         if (pstr->oss.setup_list == NULL)
@@ -2886,7 +2886,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
                         if (! template.task_name) {
                                 kfree(setup);
                                 buffer->error = -ENOMEM;
-                                mutex_lock(&pstr->oss.setup_mutex);
+                                mutex_unlock(&pstr->oss.setup_mutex);
                                 return;
                         }
                 }