5 files changed, 11 insertions, 7 deletions

diff --git a/sound/core/jack.c b/sound/core/jack.c
index dd4a12dc09a..077a85262c1 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -47,7 +47,7 @@ static int snd_jack_dev_register(struct snd_device *device)
         int err;
 
         snprintf(jack->name, sizeof(jack->name), "%s %s",
-                 card->longname, jack->id);
+                 card->shortname, jack->id);
         jack->input_dev->name = jack->name;
 
         /* Default to the sound card device. */
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;
                         }
                 }
diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index a466443c4a2..2fa9299a440 100644
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -157,7 +157,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
                 while (dst_frames1 > 0) {
                         S1 = S2;
                         if (src_frames1-- > 0) {
-                                S1 = *src;
+                                S2 = *src;
                                 src += src_step;
                         }
                         if (pos & ~R_MASK) {
diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c
index d4564edd61d..4e7ec2b4987 100644
--- a/sound/core/sgbuf.c
+++ b/sound/core/sgbuf.c
@@ -38,6 +38,10 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
         if (! sgbuf)
                 return -EINVAL;
 
+        if (dmab->area)
+                vunmap(dmab->area);
+        dmab->area = NULL;
+
         tmpb.dev.type = SNDRV_DMA_TYPE_DEV;
         tmpb.dev.dev = sgbuf->dev;
         for (i = 0; i < sgbuf->pages; i++) {
@@ -48,9 +52,6 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
                 tmpb.bytes = (sgbuf->table[i].addr & ~PAGE_MASK) << PAGE_SHIFT;
                 snd_dma_free_pages(&tmpb);
         }
-        if (dmab->area)
-                vunmap(dmab->area);
-        dmab->area = NULL;
 
         kfree(sgbuf->table);
         kfree(sgbuf->page_table);