upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / sound / pci / rme32.c

diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 2c13176..b96acd5 100644 (file)
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1183,15 +1183,14 @@ static int snd_rme32_playback_fd_ack(snd_pcm_substream_t *substream)
 {
        rme32_t *rme32 = snd_pcm_substream_chip(substream);
        snd_pcm_indirect_t *rec, *cprec;
-       unsigned long flags;
 
        rec = &rme32->playback_pcm;
        cprec = &rme32->capture_pcm;
-       spin_lock_irqsave(&rme32->lock, flags);
+       spin_lock(&rme32->lock);
        rec->hw_queue_size = RME32_BUFFER_SIZE;
        if (rme32->running & (1 << SNDRV_PCM_STREAM_CAPTURE))
                rec->hw_queue_size -= cprec->hw_ready;
-       spin_unlock_irqrestore(&rme32->lock, flags);
+       spin_unlock(&rme32->lock);
        snd_pcm_indirect_playback_transfer(substream, rec,
                                           snd_rme32_pb_trans_copy);
        return 0;
@@ -1916,21 +1915,21 @@ static snd_kcontrol_new_t snd_rme32_controls[] = {
                .private_value = IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS
        },
        {
-               .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Input Connector",
                .info = snd_rme32_info_inputtype_control,
                .get =  snd_rme32_get_inputtype_control,
                .put =  snd_rme32_put_inputtype_control
        },
        {
-               .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Loopback Input",
                .info = snd_rme32_info_loopback_control,
                .get =  snd_rme32_get_loopback_control,
                .put =  snd_rme32_put_loopback_control
        },
        {
-               .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Sample Clock Source",
                .info = snd_rme32_info_clockmode_control,
                .get =  snd_rme32_get_clockmode_control,