This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / pci / emu10k1 / emupcm.c

diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 080d9d4..9fbbf6c 100644 (file)
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1092,7 +1092,6 @@ static int snd_emu10k1_pcm_efx_voices_mask_put(snd_kcontrol_t * kcontrol, snd_ct
        emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
        unsigned int nval[2], bits;
        int nefx = emu->audigy ? 64 : 32;
-       int nefxb = emu->audigy ? 7 : 6;
        int change, idx;
        
        nval[0] = nval[1] = 0;
@@ -1101,14 +1100,8 @@ static int snd_emu10k1_pcm_efx_voices_mask_put(snd_kcontrol_t * kcontrol, snd_ct
                        nval[idx / 32] |= 1 << (idx % 32);
                        bits++;
                }
-               
-       for (idx = 0; idx < nefxb; idx++)
-               if (1 << idx == bits)
-                       break;
-       
-       if (idx >= nefxb)
+       if (bits != 1 && bits != 2 && bits != 4 && bits != 8)
                return -EINVAL;
-
        spin_lock_irq(&emu->reg_lock);
        change = (nval[0] != emu->efx_voices_mask[0]) ||
                (nval[1] != emu->efx_voices_mask[1]);
@@ -1192,7 +1185,7 @@ static void fx8010_pb_trans_copy(snd_pcm_substream_t *substream,
        }
        snd_emu10k1_fx8010_playback_tram_poke1((unsigned short *)emu->fx8010.etram_pages.area + tram_pos,
                                               (unsigned short *)emu->fx8010.etram_pages.area + tram_pos + tram_size / 2,
-                                              src, frames, tram_shift);
+                                              src, frames, tram_shift++);
        tram_pos -= frames;
        pcm->tram_pos = tram_pos;
        pcm->tram_shift = tram_shift;