Merge branch 'topic/beep-rename' into topic/core-change

2 files changed, 12 insertions, 2 deletions

diff --git a/sound/core/isadma.c b/sound/core/isadma.c
index 79f0f16af339..950e19ba91fc 100644
--- a/sound/core/isadma.c
+++ b/sound/core/isadma.c
@@ -85,16 +85,24 @@ EXPORT_SYMBOL(snd_dma_disable);
 unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
 {
         unsigned long flags;
-        unsigned int result;
+        unsigned int result, result1;
 
         flags = claim_dma_lock();
         clear_dma_ff(dma);
         if (!isa_dma_bridge_buggy)
                 disable_dma(dma);
         result = get_dma_residue(dma);
+        /*
+         * HACK - read the counter again and choose higher value in order to
+         * avoid reading during counter lower byte roll over if the
+         * isa_dma_bridge_buggy is set.
+         */
+        result1 = get_dma_residue(dma);
         if (!isa_dma_bridge_buggy)
                 enable_dma(dma);
         release_dma_lock(flags);
+        if (unlikely(result < result1))
+                result = result1;
 #ifdef CONFIG_SND_DEBUG
         if (result > size)
                 snd_printk(KERN_ERR "pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n", result, dma, size);
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 772423889eb3..54e2eb56e4c2 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1251,7 +1251,9 @@ static void snd_mixer_oss_build(struct snd_mixer_oss *mixer)
                 { SOUND_MIXER_SYNTH,    "FM",                   0 }, /* fallback */
                 { SOUND_MIXER_SYNTH,    "Music",                0 }, /* fallback */
                 { SOUND_MIXER_PCM,      "PCM",                  0 },
-                { SOUND_MIXER_SPEAKER,  "PC Speaker",           0 },
+                { SOUND_MIXER_SPEAKER,  "Beep",                 0 },
+                { SOUND_MIXER_SPEAKER,  "PC Speaker",           0 }, /* fallback */
+                { SOUND_MIXER_SPEAKER,  "Speaker",              0 }, /* fallback */
                 { SOUND_MIXER_LINE,     "Line",                 0 },
                 { SOUND_MIXER_MIC,      "Mic",                  0 },
                 { SOUND_MIXER_CD,       "CD",                   0 },