diff options
author | Takashi Iwai | 2010-09-03 22:38:52 +0200 |
---|---|---|
committer | Takashi Iwai | 2010-09-03 22:38:52 +0200 |
commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /sound/pci/hda/hda_codec.h | |
parent | ALSA: usb-audio: add BOSS ME-25 support (diff) | |
parent | ALSA: usb-audio: fix detection of vendor-specific device protocol settings (diff) | |
download | kernel-qcow2-linux-68885a3ff38ed51fa02f241feb405c9922a90ee0.tar.gz kernel-qcow2-linux-68885a3ff38ed51fa02f241feb405c9922a90ee0.tar.xz kernel-qcow2-linux-68885a3ff38ed51fa02f241feb405c9922a90ee0.zip |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r-- | sound/pci/hda/hda_codec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 4303353feda9..62c702240108 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -648,6 +648,7 @@ struct hda_bus { struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; struct mutex cmd_mutex; + struct mutex prepare_mutex; /* unsolicited event queue */ struct hda_bus_unsolicited *unsol; @@ -826,7 +827,6 @@ struct hda_codec { struct mutex spdif_mutex; struct mutex control_mutex; - struct mutex prepare_mutex; unsigned int spdif_status; /* IEC958 status bits */ unsigned short spdif_ctls; /* SPDIF control bits */ unsigned int spdif_in_enable; /* SPDIF input enable? */ |