Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[pandora-kernel.git] / sound / oss / i810_audio.c

diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index 4600cd6..dd2b871 100644 (file)
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -100,6 +100,8 @@
 #include <linux/smp_lock.h>
 #include <linux/ac97_codec.h>
 #include <linux/bitops.h>
+#include <linux/mutex.h>
+
 #include <asm/uaccess.h>
 
 #define DRIVER_VERSION "1.01"
@@ -312,7 +314,8 @@ static struct pci_device_id i810_pci_tbl [] = {
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_18,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
-
+       {PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_AUDIO,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
        {0,}
 };
 
@@ -330,7 +333,7 @@ struct i810_state {
        struct i810_card *card; /* Card info */
 
        /* single open lock mechanism, only used for recording */
-       struct semaphore open_sem;
+       struct mutex open_mutex;
        wait_queue_head_t open_wait;
 
        /* file mode */
@@ -2596,7 +2599,7 @@ found_virt:
        state->card = card;
        state->magic = I810_STATE_MAGIC;
        init_waitqueue_head(&dmabuf->wait);
-       init_MUTEX(&state->open_sem);
+       mutex_init(&state->open_mutex);
        file->private_data = state;
        dmabuf->trigger = 0;
 
@@ -3212,7 +3215,7 @@ static void __devinit i810_configure_clocking (void)
                state->card = card;
                state->magic = I810_STATE_MAGIC;
                init_waitqueue_head(&dmabuf->wait);
-               init_MUTEX(&state->open_sem);
+               mutex_init(&state->open_mutex);
                dmabuf->fmt = I810_FMT_STEREO | I810_FMT_16BIT;
                dmabuf->trigger = PCM_ENABLE_OUTPUT;
                i810_set_spdif_output(state, -1, 0);
@@ -3427,7 +3430,6 @@ out_iospace:
                release_mem_region(card->ac97base_mmio_phys, 512);
                release_mem_region(card->iobase_mmio_phys, 256);
        }
-out_pio:       
        release_region(card->ac97base, 256);
 out_region2:
        release_region(card->iobase, 64);