fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / pci / hda / hda_codec.h

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 63e26c7..c12bc4e 100644 (file)
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -438,7 +438,7 @@ struct hda_bus {
        struct list_head codec_list;
        struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
 
-       struct semaphore cmd_mutex;
+       struct mutex cmd_mutex;
 
        /* unsolicited event queue */
        struct hda_bus_unsolicited *unsol;
@@ -479,7 +479,7 @@ struct hda_codec_ops {
 struct hda_amp_info {
        u32 key;                /* hash key */
        u32 amp_caps;           /* amp capabilities */
-       u16 vol[2];             /* current volume & mute*/
+       u16 vol[2];             /* current volume & mute */
        u16 status;             /* update flag */
        u16 next;               /* next link */
 };
@@ -559,7 +559,7 @@ struct hda_codec {
        int amp_info_size;
        struct hda_amp_info *amp_info;
 
-       struct semaphore spdif_mutex;
+       struct mutex spdif_mutex;
        unsigned int spdif_status;      /* IEC958 status bits */
        unsigned short spdif_ctls;      /* SPDIF control bits */
        unsigned int spdif_in_enable;   /* SPDIF input enable? */